- cleaning

Changed files:
    sockd.init -> 1.2

diff --git a/sockd.init b/sockd.init
index 8553bdecbe3cf7cbdfea15bb4ba30e8a0682373a..45d8fc5da87cc9e816673d35e44eaa1f12f54221 100644 (file)
--- a/sockd.init
+++ b/sockd.init
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# sockd         This shell script takes care of starting and stopping
-#               the Dante server.
+# sockd                This shell script takes care of starting and stopping
+#              the Dante server.
 #
-# chkconfig: 2345 65 35
-# description: sockd implements a socks v4/v5 proxy server
+# chkconfig:   2345 65 35
+# description: sockd implements a socks v4/v5 proxy server
 #
 # processname: sockd
 # pidfile:     /var/run/sockd.pid
@@ -20,35 +20,41 @@
 [ -f /etc/sysconfig/sockd ] && . /etc/sysconfig/sockd
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_Network_Down sockdd
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               # nls "ERROR: Networking is down. %s can't be run." <service>
+               msg_network_down sockdd
+               exit 1
+       fi
+else
+       exit 0
 fi
 
+
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/sockd ]; then
+       if [ ! -f /var/lock/subsys/sockd ]; then
                msg_starting sockd
                daemon sockd -D
-               RETVAL=$?
+               RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sockd
        else
-               msg_Already_Running sockd
-               exit 1
+               msg_already_running sockd
+               exit 1
        fi
        ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/sockd ]; then
-                msg_stopping sockd
-                killproc sockd
-                rm -f /var/lock/subsys/sockd /var/run/sockd.pid >/dev/null 2>&1
-        else
-               msg_Not_Running sockd
-               exit 1
+               msg_stopping sockd
+               killproc sockd
+               RETVAL=$?
+               rm -f /var/lock/subsys/sockd /var/run/sockd.pid >/dev/null 2>&1
+       else
+               msg_not_running sockd
+               exit 1
        fi
        ;;
   status)
@@ -58,9 +64,14 @@ case "$1" in
   restart|reload)
        $0 stop
        $0 start
+       exit $?
+       ;;
+  force-reload)
+       $0 stop && $0 start
+       exit $?
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
        exit 1
        ;;
 esac