diff options
| -rw-r--r-- | source4/script/tests/Samba4.pm | 2 | ||||
| -rwxr-xr-x | source4/script/tests/mk-fedora-ds.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index 0a92f36dc8..54d1d62167 100644 --- a/source4/script/tests/Samba4.pm +++ b/source4/script/tests/Samba4.pm @@ -23,7 +23,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{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d$ENV{FEDORA_DS_LOGLEVEL} > $ENV{LDAPDIR}/logs 2>&1 &"); + system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d$ENV{FEDORA_DS_LOGLEVEL} -i $ENV{FEDORA_DS_PIDFILE}> $ENV{LDAPDIR}/logs 2>&1 &"); } else { my $oldpath = $ENV{PATH}; $ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}"; diff --git a/source4/script/tests/mk-fedora-ds.sh b/source4/script/tests/mk-fedora-ds.sh index 7ea012d0cb..d828c5415c 100755 --- a/source4/script/tests/mk-fedora-ds.sh +++ b/source4/script/tests/mk-fedora-ds.sh @@ -7,6 +7,8 @@ echo "FEDORA_DS_LOGLEVEL=0" FEDORA_DS_DIR=$LDAPDIR/slapd-samba4 echo FEDORA_DS_DIR=$FEDORA_DS_DIR +echo "FEDORA_DS_PIDFILE=$FEDORA_DS_DIR/logs/slapd-samba4.pid" + cat >$FEDORA_DS_INF <<EOF [General] SuiteSpotUserID = $ROOT |