From 8edcbc847452b8e95c99427f94dde1fa968089a6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 5 Dec 2007 04:26:28 +0100 Subject: r26305: Update template files and testsuite to try and work with current openldap, and fully support different LDAP server locations. Andrew Bartlett (This used to be commit a00bb942537f0f638c2a8295770749cb4b5d9ef3) --- source4/selftest/env/Samba4.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source4/selftest') diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index 2f846bbdb0..8a6d40f3ca 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -24,9 +24,13 @@ sub new($$$$) { 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; } -- cgit