diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-09-19 22:20:08 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@sn-devel-104.sn.samba.org> | 2010-10-03 15:23:18 +0000 |
| commit | e3081b92c16198332f5242a0395701ddfa7392e5 (patch) | |
| tree | 36c83e4f3ac7486306569510c25ea650ac58f117 /source4/dsdb/samdb/ldb_modules/objectclass.c | |
| parent | 46282da011b411daac052e07a576987d155638b1 (diff) | |
| download | samba-e3081b92c16198332f5242a0395701ddfa7392e5.tar.gz samba-e3081b92c16198332f5242a0395701ddfa7392e5.tar.bz2 samba-e3081b92c16198332f5242a0395701ddfa7392e5.zip | |
s4:dsdb - substitute the "show_deleted" with the "show_recycled" control
We intend to see always all objects with the "show_deleted" control specified.
To see also recycled objects (beginning with 2008_R2 function level) we need to
use the new "show_recycled" control.
As far as I see this is only internal code and therefore we don't run into
problems if we do substitute it.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/objectclass.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectclass.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index 11d61af446..82c4144f22 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -1154,10 +1154,11 @@ static int objectclass_rename(struct ldb_module *module, struct ldb_request *req return ret; } - /* we have to add the show deleted control, as otherwise DRS + /* we have to add the show recycled control, as otherwise DRS deletes will be refused as we will think the target parent does not exist */ - ret = ldb_request_add_control(search_req, LDB_CONTROL_SHOW_DELETED_OID, false, NULL); + ret = ldb_request_add_control(search_req, LDB_CONTROL_SHOW_RECYCLED_OID, + false, NULL); if (ret != LDB_SUCCESS) { return ret; |