svn commit: samba r25960 - in branches/SAMBA_4_0/source: ldap_server setup

[abartlet at samba.org]

Author: abartlet
Date: 2007-11-15 02:45:31 +0000 (Thu, 15 Nov 2007)
New Revision: 25960

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25960

Log:
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

Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
   branches/SAMBA_4_0/source/setup/provision_init.ldif
   branches/SAMBA_4_0/source/setup/provision_partitions.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c	2007-11-15 01:53:44 UTC (rev 25959)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c	2007-11-15 02:45:31 UTC (rev 25960)
@@ -300,10 +300,6 @@
 			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;

Modified: branches/SAMBA_4_0/source/setup/provision_init.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_init.ldif	2007-11-15 01:53:44 UTC (rev 25959)
+++ branches/SAMBA_4_0/source/setup/provision_init.ldif	2007-11-15 02:45:31 UTC (rev 25960)
@@ -23,6 +23,9 @@
 systemFlags: INTEGER
 userAccountControl: INTEGER
 
+dn: @OPTIONS
+checkBaseOnSearch: TRUE
+
 dn: @KLUDGEACL
 passwordAttribute: sambaPassword
 passwordAttribute: ntPwdHash

Modified: branches/SAMBA_4_0/source/setup/provision_partitions.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-11-15 01:53:44 UTC (rev 25959)
+++ branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-11-15 02:45:31 UTC (rev 25960)
@@ -4,6 +4,7 @@
 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}