r26305: Update template files and testsuite to try and work with current

openldap, and fully support different LDAP server locations.

Andrew Bartlett

diff --git a/source/selftest/env/Samba4.pm b/source/selftest/env/Samba4.pm
index 2f846bbdb0d022b2d311d8d631e310e0ba62ca3d..8a6d40f3ca0dfe2686bbbfc2e04427bfe73e8ce2 100644 (file)
--- a/source/selftest/env/Samba4.pm
+++ b/source/selftest/env/Samba4.pm
@@ -24,9 +24,13 @@ sub new($$$$) {
 
 sub openldap_start($$$) {
         my ($slapd_conf, $uri, $logs) = @_;
-        my $oldpath = $ENV{PATH};
-        $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
-        system("slapd -d0 -f $slapd_conf -h $uri > $logs 2>&1 &");
+       my $oldpath = $ENV{PATH};
+       my $olpath = "";
+       if (defined $ENV{OPENLDAP_PATH}) {
+               $olpath = "$ENV{OPENLDAP_PATH}:"
+       }
+       $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
+        system("slapd -d63 -f $slapd_conf -h $uri > $logs 2>&1 &");
         $ENV{PATH} = $oldpath;
 }
 

diff --git a/source/setup/schema-map-openldap-2.3 b/source/setup/schema-map-openldap-2.3
index 3bbd6d9e572b9b14e039da221ec9aa30f2eea8b7..0bce95afba4c6487600f19bd38da4ca9bb4bd9ce 100644 (file)
--- a/source/setup/schema-map-openldap-2.3
+++ b/source/setup/schema-map-openldap-2.3
@@ -11,6 +11,7 @@ distinguishedName
 description
 cn
 top
+memberOf
 #This shouldn't make it to the ldap server
 sambaPassword
 #These conflict with OpenLDAP builtins

diff --git a/source/setup/slapd.conf b/source/setup/slapd.conf
index 15e3610e3ae7690e5292ec5e0455edc4e67499c7..0fd018e943942c027f50ac7144c7eb28d64babdb 100644 (file)
--- a/source/setup/slapd.conf
+++ b/source/setup/slapd.conf
@@ -40,10 +40,10 @@ index           samAccountName eq
 index name eq
 index objectSid eq
 index objectCategory eq
-index nCName eq pres
+index nCName eq
 index subClassOf eq
 index dnsRoot eq
-index nETBIOSName eq pres
+index nETBIOSName eq
 
 database        hdb
 suffix         ${DOMAINDN}
@@ -60,11 +60,11 @@ index uidNumber eq
 index gidNumber eq
 index unixName eq
 index privilege eq
-index nCName eq pres
+index nCName eq
 index lDAPDisplayName eq
 index subClassOf eq
 index dnsRoot eq
-index nETBIOSName eq pres
+index nETBIOSName eq
 
 #syncprov is stable in OpenLDAP 2.3, and available in 2.2.  
 #We only need this for the contextCSN attribute anyway....