From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 31 Jul 2012 07:10:42 +0000 (+1000)
Subject: s4-dsdb: Request extended DN and show deleted when searching for a possible parent
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=221cd524e31fce5efa2de179074cfe97bf2c909c;p=metze%2Fsamba%2Fwip.git

s4-dsdb: Request extended DN and show deleted when searching for a possible parent

This fixes up the lastKnownParent attribute on lostAndFound objects to have a GUID

(found by dbcheck).

Andrew Bartlett
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 930696a26a48..3e15eefc1f47 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -3894,8 +3894,10 @@ static int replmd_replicated_apply_search_for_parent(struct replmd_replicated_re
 				   ar->req);
 	LDB_REQ_SET_LOCATION(search_req);
 
-	ret = ldb_request_add_control(search_req, LDB_CONTROL_SHOW_RECYCLED_OID,
-				      true, NULL);
+	ret = dsdb_request_add_controls(search_req, 
+					DSDB_SEARCH_SHOW_RECYCLED|
+					DSDB_SEARCH_SHOW_DELETED|
+					DSDB_SEARCH_SHOW_EXTENDED_DN);
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}