r26424: Patch and hits from Howard Chu <hyc@symas.com> 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
(This used to be commit 1ffada95d269c8f7d054bec7f6eaff8449995d40)

diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index 9e3c29b32bed1f65c25dbf396988b2356ac7f74f..dbddb25465f490c5039da8477be2efc94467e2ee 100644 (file)
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -25,9 +25,11 @@ sub new($$$$) {
 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 @@ sub mk_openldap($$$)
 
        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}";
 

diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf
index 0fd018e943942c027f50ac7144c7eb28d64babdb..446facbf3d6d4c53a7a1b645581c4a4071958013 100644 (file)
--- a/source4/setup/slapd.conf
+++ b/source4/setup/slapd.conf
@@ -22,7 +22,7 @@ include ${LDAPDIR}/modules.conf
 defaultsearchbase ${DOMAINDN}
 
 backend                hdb
-database        bdb
+database        hdb
 suffix         ${SCHEMADN}
 directory      ${LDAPDIR}/db/schema
 index           objectClass eq