summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/ldap_server/ldap_backend.c4
-rw-r--r--source4/setup/provision_init.ldif3
-rw-r--r--source4/setup/provision_partitions.ldif1
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}