From 03f178a728ba41f6ec82d35201ad25421e1bb951 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 13 Dec 2007 09:46:41 +0100 Subject: r26424: Patch and hits from Howard Chu 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) --- source4/selftest/env/Samba4.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source4/selftest') 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}"; -- cgit