summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-04-11 10:25:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:56 -0500
commit5f11116a6b67f206adf738370fa66feda4acaa9d (patch)
treebf6b8559738b967c78f162b28c16ffae85dbb829
parentf02c0a64d3e642032c8371ff760910073164fa6d (diff)
downloadsamba-5f11116a6b67f206adf738370fa66feda4acaa9d.tar.gz
samba-5f11116a6b67f206adf738370fa66feda4acaa9d.tar.bz2
samba-5f11116a6b67f206adf738370fa66feda4acaa9d.zip
r22167: This seems to get Fedora DS to run the tests again.
Andrew Bartlett (This used to be commit b893c63183eaec20ab0000d0c6635672c2893dce)
-rw-r--r--source4/script/tests/Samba4.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 48e7d3aaa6..299bfb97e2 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -27,7 +27,7 @@ sub slapd_start($$)
# running slapd in the background means it stays in the same process group, so it can be
# killed by timelimit
if (defined($ENV{FEDORA_DS_PREFIX})) {
- system("$env_vars->{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d$env_vars->{FEDORA_DS_LOGLEVEL} -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
+ system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $env_vars->{FEDORA_DS_DIR} -d$env_vars->{FEDORA_DS_LOGLEVEL} -i $env_vars->{FEDORA_DS_PIDFILE}> $env_vars->{LDAPDIR}/logs 2>&1 &");
} else {
my $oldpath = $ENV{PATH};
$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
@@ -48,7 +48,7 @@ sub slapd_start($$)
sub slapd_stop($$)
{
my ($self, $envvars) = @_;
- if (defined($envvars->{FEDORA_DS_PREFIX})) {
+ if (defined($ENV{FEDORA_DS_PREFIX})) {
system("$envvars->{LDAPDIR}/slapd-samba4/stop-slapd");
} else {
open(IN, "<$envvars->{OPENLDAP_PIDFILE}") or