diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-12-05 04:26:28 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:19 +0100 |
| commit | 8edcbc847452b8e95c99427f94dde1fa968089a6 (patch) | |
| tree | c3441c7267ef521bf8c98b016995a01ec688366f /source4/selftest | |
| parent | 439f85c60976cd1fd725b78b8b0a061cba219424 (diff) | |
| download | samba-8edcbc847452b8e95c99427f94dde1fa968089a6.tar.gz samba-8edcbc847452b8e95c99427f94dde1fa968089a6.tar.bz2 samba-8edcbc847452b8e95c99427f94dde1fa968089a6.zip | |
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)
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 10 |
1 files changed, 7 insertions, 3 deletions
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; } |