From bd6a651b38446512af4982a376ddead658b6ee74 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 15 Nov 2007 02:45:31 +0100
Subject: r25960: Enable checks on the validity of the search base on sam.ldb
 in Samba4.

Remove bogus check to return NO_SUCH_ENTRY in ldap_backend.c, as this
error is now correctly emited from ldb.

Andrew Bartlett
(This used to be commit ed57862b90812e5a38ca81935b131338112fb19f)
---
 source4/ldap_server/ldap_backend.c      | 4 ----
 source4/setup/provision_init.ldif       | 3 +++
 source4/setup/provision_partitions.ldif | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 25d19a5a58..62fe6270dc 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -300,10 +300,6 @@ reply:
 			DEBUG(10,("SearchRequest: results: [%d]\n", res->count));
 			result = LDAP_SUCCESS;
 			errstr = NULL;
-		} else if (res->count == 0) {
-			DEBUG(10,("SearchRequest: no results\n"));
-			result = LDAP_NO_SUCH_OBJECT;
-			errstr = ldb_errstring(samdb);
 		}
 		if (res->controls) {
 			done_r->msg->controls = res->controls;
diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index a69399c3e6..c922fa0bd2 100644
--- a/source4/setup/provision_init.ldif
+++ b/source4/setup/provision_init.ldif
@@ -23,6 +23,9 @@ sAMAccountType: INTEGER
 systemFlags: INTEGER
 userAccountControl: INTEGER
 
+dn: @OPTIONS
+checkBaseOnSearch: TRUE
+
 dn: @KLUDGEACL
 passwordAttribute: sambaPassword
 passwordAttribute: ntPwdHash
diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index f07ec680e0..674e16713d 100644
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -4,6 +4,7 @@ partition: ${CONFIGDN}:${CONFIGDN_LDB}
 partition: ${DOMAINDN}:${DOMAINDN_LDB}
 replicateEntries: @ATTRIBUTES
 replicateEntries: @INDEXLIST
+replicateEntries: @OPTIONS
 modules:${SCHEMADN}:${SCHEMADN_MOD}${SCHEMADN_MOD2}
 modules:${CONFIGDN}:${CONFIGDN_MOD}${CONFIGDN_MOD2}
 modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2}
-- 
cgit