diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2014-11-07 07:08:29 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-02-03 05:02:11 +0100 |
| commit | 72c55980e3adf1f47cf973c8c1a3f87e98121276 (patch) | |
| tree | 28f4bb2bc68192a57b6e60d057bc83fdf59edec2 /source4/dsdb | |
| parent | 4c5c7d3c1c09835729404c13961572a9cb4be16c (diff) | |
| download | samba-72c55980e3adf1f47cf973c8c1a3f87e98121276.tar.gz samba-72c55980e3adf1f47cf973c8c1a3f87e98121276.tar.xz samba-72c55980e3adf1f47cf973c8c1a3f87e98121276.zip | |
s4-dsdb/reanimate: Use 'show deleted' control in modify operations too
Before committing changes, object is still deleted - isDeleted = true
Change-Id: Ie1ab53dc594d1bfaf5b9e06316e7a1fc0dd4b8cb
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/tombstone_reanimate.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c index 51660bb255..070d952aa1 100644 --- a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c +++ b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c @@ -195,6 +195,13 @@ static int _tr_do_modify(struct ldb_module *module, struct ldb_request *parent_r return ret; } + /* We need this since object is 'delete' atm */ + ret = ldb_request_add_control(mod_req, LDB_CONTROL_SHOW_DELETED_OID, false, NULL); + if (ret != LDB_SUCCESS) { + talloc_free(tmp_ctx); + return ret; + } + /* mark request as part of Tombstone reanimation */ ret = ldb_request_add_control(mod_req, DSDB_CONTROL_RESTORE_TOMBSTONE_OID, false, NULL); if (ret != LDB_SUCCESS) { |