- log service name which was refused too ( -libwrap_srv_name_log.patch).

[packages/stunnel.git] / stunnel.init

diff --git a/stunnel.init b/stunnel.init
index 0bab2f006833dbd7c79fc5db8d1c55463cad7cba..6d202b3308a119165374b7e74e0e08be8eaa59e8 100644 (file)
--- a/stunnel.init
+++ b/stunnel.init
@@ -20,7 +20,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down stunnel
                exit 1
        fi
@@ -34,7 +34,7 @@ if [ ! -f "$STUNNEL_CONFIG" ]; then
        exit 1
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -46,36 +46,29 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/stunnel
        else
                msg_already_running stunnel
-               exit 1
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/stunnel ]; then
                msg_stopping stunnel
                killproc stunnel
-               RETVAL=$?
                rm -f /var/run/stunnel/stunnel.pid /var/lock/subsys/stunnel >/dev/null 2>&1
        else
                msg_not_running stunnel
-               exit 1
        fi      
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
        exit $?
        ;;
-  force-reload)
-       $0 stop && $0 start
-       exit $?
-       ;;
   status)
        status stunnel
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL