summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/env/Samba4.pm12
-rw-r--r--source4/setup/slapd.conf2
2 files changed, 9 insertions, 5 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index 9e3c29b32b..dbddb25465 100644
--- 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 0fd018e943..446facbf3d 100644
--- 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