Author: abartlet Date: 2007-12-13 09:46:41 +0000 (Thu, 13 Dec 2007) New Revision: 26424
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26424 Log: Patch and hits from Howard Chu <[EMAIL PROTECTED]> for our automated setup of OpenLDAP. This makes it consistant with the Fedora DS setup, and doesn't mix both hdb and bdb. Andrew Bartlett Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm 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-13 09:13:35 UTC (rev 26423) +++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-13 09:46:41 UTC (rev 26424) @@ -25,9 +25,11 @@ sub openldap_start($$$) { my ($slapd_conf, $uri, $logs) = @_; my $oldpath = $ENV{PATH}; + my $olroot = ""; my $olpath = ""; - if (defined $ENV{OPENLDAP_PATH}) { - $olpath = "$ENV{OPENLDAP_PATH}:" + if (defined $ENV{OPENLDAP_ROOT}) { + $olroot = "$ENV{OPENLDAP_ROOT}"; + $olpath = "$olroot/libexec:$olroot/sbin:"; } $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; system("slapd -d63 -f $slapd_conf -h $uri > $logs 2>&1 &"); @@ -225,8 +227,10 @@ my $oldpath = $ENV{PATH}; my $olpath = ""; - if (defined $ENV{OPENLDAP_PATH}) { - $olpath = "$ENV{OPENLDAP_PATH}:" + my $olroot = ""; + if (defined $ENV{OPENLDAP_ROOT}) { + $olroot = "$ENV{OPENLDAP_ROOT}"; + $olpath = "$olroot/libexec:$olroot/sbin:"; } $ENV{PATH} = "$olpath/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; Modified: branches/SAMBA_4_0/source/setup/slapd.conf =================================================================== --- branches/SAMBA_4_0/source/setup/slapd.conf 2007-12-13 09:13:35 UTC (rev 26423) +++ branches/SAMBA_4_0/source/setup/slapd.conf 2007-12-13 09:46:41 UTC (rev 26424) @@ -22,7 +22,7 @@ defaultsearchbase ${DOMAINDN} backend hdb -database bdb +database hdb suffix ${SCHEMADN} directory ${LDAPDIR}/db/schema index objectClass eq
