summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-11-24 23:21:10 +0100
committerMichael Adam <obnox@samba.org>2012-11-30 17:17:21 +0100
commitff274bafeb223c7440f4d97e2225b954b1031259 (patch)
treee827ffc2c55912adf39f2f70cba72272c6f12cfd
parent5838637b4218ecf88e7a650610da3be1a5a518c9 (diff)
downloadsamba-ff274bafeb223c7440f4d97e2225b954b1031259.tar.gz
samba-ff274bafeb223c7440f4d97e2225b954b1031259.tar.bz2
samba-ff274bafeb223c7440f4d97e2225b954b1031259.zip
s4:dsdb/objectclass: do not pass the callers controls on helper searches
We add AS_SYSTEM and SHOW_RECYCLED to the helper search, don't let the caller specify additional controls. This also fixes a problem when the caller also specified AS_SYSTEM. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source4/dsdb/samdb/ldb_modules/objectclass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 590927a7aa..de154ec018 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -1264,7 +1264,7 @@ static int objectclass_delete(struct ldb_module *module, struct ldb_request *req
ret = ldb_build_search_req(&search_req, ldb,
ac, req->op.del.dn, LDB_SCOPE_BASE,
"(objectClass=*)",
- attrs, req->controls,
+ attrs, NULL,
ac, get_search_callback,
req);
LDB_REQ_SET_LOCATION(search_req);