From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 19 Nov 2012 05:59:33 +0000 (+0100)
Subject: objectclass AS_SYSTEM
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=e28fbfcac57d5104bd20819f9c00fbdc96bb03f7

objectclass AS_SYSTEM
---

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 074360086f92..51b7b4c42398 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -351,6 +351,14 @@ static int objectclass_add(struct ldb_module *module, struct ldb_request *req)
 		return ret;
 	}
 
+	ret = dsdb_request_add_controls(search_req,
+					DSDB_FLAG_AS_SYSTEM|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_RECYCLED);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
 	ac->step_fn = objectclass_do_add;
 
 	return ldb_next_request(ac->module, search_req);
@@ -797,6 +805,14 @@ static int oc_modify_callback(struct ldb_request *req, struct ldb_reply *ares)
 		return ldb_module_done(ac->req, NULL, NULL, ret);
 	}
 
+	ret = dsdb_request_add_controls(search_req,
+					DSDB_FLAG_AS_SYSTEM|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_RECYCLED);
+	if (ret != LDB_SUCCESS) {
+		return ldb_module_done(ac->req, NULL, NULL, ret);
+	}
+
 	ac->step_fn = objectclass_do_mod;
 
 	ret = ldb_next_request(ac->module, search_req);
@@ -1021,9 +1037,10 @@ static int objectclass_rename(struct ldb_module *module, struct ldb_request *req
 	/* 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_RECYCLED_OID,
-				      false, NULL);
-
+	ret = dsdb_request_add_controls(search_req,
+					DSDB_FLAG_AS_SYSTEM|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_RECYCLED);
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
@@ -1071,6 +1088,14 @@ static int objectclass_do_rename(struct oc_context *ac)
 		return ret;
 	}
 
+	ret = dsdb_request_add_controls(search_req,
+					DSDB_FLAG_AS_SYSTEM|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_RECYCLED);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
 	ac->step_fn = objectclass_do_rename2;
 
 	return ldb_next_request(ac->module, search_req);
@@ -1251,6 +1276,14 @@ static int objectclass_delete(struct ldb_module *module, struct ldb_request *req
 		return ret;
 	}
 
+	ret = dsdb_request_add_controls(search_req,
+					DSDB_FLAG_AS_SYSTEM|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_RECYCLED);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
 	ac->step_fn = objectclass_do_delete;
 
 	return ldb_next_request(ac->module, search_req);