diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2014-11-27 05:15:58 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-02-03 05:02:12 +0100 |
| commit | ac2931628cb79543b8ed96b4522bff8958541bd5 (patch) | |
| tree | 734c41dab490076e384e3a0fbb1fa11692273fa2 /source4/dsdb | |
| parent | e30be9a948241c7c42a7d0f8f4610489910987da (diff) | |
| download | samba-ac2931628cb79543b8ed96b4522bff8958541bd5.tar.gz | |
s4-dsdb/samldb: Relax a bit restrictions in Config partition while restoring deleted object
Change-Id: Iead460d24058b160b46cf3ddedaf4d84b844da4d
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 39b6bdf501a..bf88168e144 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -3169,7 +3169,8 @@ static int check_rename_constraints(struct ldb_message *msg, talloc_free(dn2); } - if (!limited_move) { + if (!limited_move + && ldb_request_get_control(ac->req, DSDB_CONTROL_RESTORE_TOMBSTONE_OID) == NULL) { ldb_asprintf_errstring(ldb, "subtree_rename: Cannot move %s to %s in config partition", ldb_dn_get_linearized(olddn), ldb_dn_get_linearized(newdn)); |