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/acl_util.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/acl_util.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/acl_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/acl_util.c b/source4/dsdb/samdb/ldb_modules/acl_util.c index 6873e56abd..6c41602a82 100644 --- a/source4/dsdb/samdb/ldb_modules/acl_util.c +++ b/source4/dsdb/samdb/ldb_modules/acl_util.c @@ -73,7 +73,7 @@ int dsdb_module_check_access_on_dn(struct ldb_module *module, ret = dsdb_module_search_dn(module, mem_ctx, &acl_res, dn, acl_attrs, DSDB_FLAG_NEXT_MODULE | - DSDB_SEARCH_SHOW_DELETED); + DSDB_SEARCH_SHOW_RECYCLED); if (ret != LDB_SUCCESS) { DEBUG(0,("access_check: failed to find object %s\n", ldb_dn_get_linearized(dn))); return ret; @@ -108,7 +108,7 @@ int dsdb_module_check_access_on_guid(struct ldb_module *module, ret = dsdb_module_search(module, mem_ctx, &acl_res, NULL, LDB_SCOPE_SUBTREE, acl_attrs, DSDB_FLAG_NEXT_MODULE | - DSDB_SEARCH_SHOW_DELETED, + DSDB_SEARCH_SHOW_RECYCLED, "objectGUID=%s", GUID_string(mem_ctx, guid)); if (ret != LDB_SUCCESS || acl_res->count == 0) { |