r21970: Ensure that Fedora DS can be shut down correctly with the stop script:

This needs the pid file to be in the right spot.

Andrew Bartlett
(This used to be commit cf9993a309ffe605610e4aaa2281576f319b5df0)

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 0a92f36dc8c409d650e53ecb25bf1b966ca7cc87..54d1d621670359129f08f2b3a360181bfcc24c3f 100644 (file)
--- 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 7ea012d0cb267db40afda0e642619ee94de80af5..d828c5415cfb6931738ef413002fcfb82de017e2 100755 (executable)
--- 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