- up to 8.13.8

[packages/sendmail.git] / sendmail.init

diff --git a/sendmail.init b/sendmail.init
index 50ede72a2df8fe196f07069a21b697168d459096..874cc81db8524679b0026f3f841d6c347702051a 100644 (file)
--- a/sendmail.init
+++ b/sendmail.init
@@ -50,12 +50,12 @@ case "$1" in
                                makemap -v hash /etc/mail/$i < /etc/mail/$i >/dev/null 2>&1
                                [ $RETVAL -eq 0 ] && RETVAL=$?
                        fi
-               done 
+               done
                [ $RETVAL -eq 0 ] && ok || fail
                msg_starting sendmail
                daemon /usr/sbin/sendmail $([ "$DAEMON" = "yes" ] && echo -bd) \
                                        $([ -n "$QUEUE" ] && echo -q$QUEUE) \
-                                       $([ "$ENABLE_IPV6" = "yes" ] && 
+                                       $([ "$ENABLE_IPV6" = "yes" ] &&
                                                echo -ODaemonPortOptions=Family=inet6 )
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sendmail
@@ -64,8 +64,6 @@ case "$1" in
        fi
        if [ ! -f /var/lock/subsys/sm-client ]; then
                msg_starting sm-client
-               touch /var/run/sm-client.pid
-               chown smmsp:smmsp /var/run/sm-client.pid
                daemon /usr/sbin/sendmail -L sm-msp-queue -Ac -q$SMQUEUE
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client
@@ -77,16 +75,16 @@ case "$1" in
        if [ -f /var/lock/subsys/sendmail ]; then
                # Stop daemons.
                msg_stopping sendmail
-               killproc sendmail
-               rm -f /var/lock/subsys/sendmail
+               killproc --pidfile sendmail.pid sendmail
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
        else
                msg_not_running sendmail
        fi
        if [ -f /var/lock/subsys/sm-client ]; then
                msg_stopping sm-client
-               killproc sendmail
+               killproc --pidfile /var/spool/clientmqueue/sm-client.pid sendmail
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && rm -f /var/run/sm-client.pid
                [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sm-client
        else
                msg_not_running sm-client