- added krb5-ftpd to obsoletes

[packages/proftpd.git] / proftpd.init

diff --git a/proftpd.init b/proftpd.init
index 008f96ff122ca8cf41c4d221534ee74b0301f03b..c4849d0d788527e5b54d69e5f1d4dff978e47636 100644 (file)
--- a/proftpd.init
+++ b/proftpd.init
@@ -3,7 +3,7 @@
 # proftpd      ProFTPD ftp server
 #
 # chkconfig:   345 85 15
-# description: ProFTPD is a highly configurable ftp daemon for unix and unix-like
+# description: ProFTPD is a highly configurable ftp daemon for unix and unix-like \
 #              operating systems.
 # processname: proftpd
 # pidfile:     /var/run/proftpd.pid
@@ -20,49 +20,51 @@
 [ -f /etc/sysconfig/proftpd ] && . /etc/sysconfig/proftpd
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_network_down proftpd
-        exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down proftpd
+               exit 1
+       fi
+else
+       exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/proftpd ]; then
+       if [ ! -f /var/lock/subsys/proftpd ]; then
                msg_starting ProFTPD
                daemon proftpd $PROFTPD_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd
        else
-               msg_already_running ProFTPD
-               exit 1
+               msg_already_running ProFTPD
        fi
        ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/proftpd ]; then
-                msg_stopping ProFTPD
-                killproc proftpd
-                rm -f /var/lock/subsys/proftpd /var/run/proftpd* > /dev/null 2>&1
-        else
+               msg_stopping ProFTPD
+               killproc proftpd
+               rm -f /var/lock/subsys/proftpd /var/run/proftpd* > /dev/null 2>&1
+       else
                msg_not_running ProFTPD
-               exit 1
        fi
        ;;
   status)
        status proftpd
        exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|status}"
-       exit 1
-       ;;
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL