Author: abartlet Date: 2007-12-05 04:26:28 +0000 (Wed, 05 Dec 2007) New Revision: 26305
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26305 Log: Update template files and testsuite to try and work with current openldap, and fully support different LDAP server locations. Andrew Bartlett Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 branches/SAMBA_4_0/source/setup/slapd.conf Changeset: Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-05 03:03:33 UTC (rev 26304) +++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-05 04:26:28 UTC (rev 26305) @@ -24,9 +24,13 @@ 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; } Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 =================================================================== --- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-12-05 03:03:33 UTC (rev 26304) +++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-12-05 04:26:28 UTC (rev 26305) @@ -11,6 +11,7 @@ description cn top +memberOf #This shouldn't make it to the ldap server sambaPassword #These conflict with OpenLDAP builtins Modified: branches/SAMBA_4_0/source/setup/slapd.conf =================================================================== --- branches/SAMBA_4_0/source/setup/slapd.conf 2007-12-05 03:03:33 UTC (rev 26304) +++ branches/SAMBA_4_0/source/setup/slapd.conf 2007-12-05 04:26:28 UTC (rev 26305) @@ -40,10 +40,10 @@ 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 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....
