- possible SECURITY note

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index a4dec7ca2bcdd99b78b615b4ef56be3fac2a9b4b..cee80391a9093a69e1316ae6bd19d00a7171e557 100644 (file)
--- a/cups.init
+++ b/cups.init
@@ -3,7 +3,7 @@
 #
 # cups         Common UNIX Printing System (CUPS)
 #
-# chkconfig:   235 95 00
+# chkconfig:   2345 90 10
 # description: Startup/shutdown script for the Common UNIX \
 #              Printing System (CUPS).
 #
@@ -18,67 +18,62 @@
 [ -f /etc/sysconfig/cups ] && . /etc/sysconfig/cups
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down CUPS
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down CUPS
+               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/cupsd ]; then
+       if [ ! -f /var/lock/subsys/cups ]; then
                msg_starting CUPS
                daemon cupsd -c /etc/cups/cupsd.conf
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cupsd
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cups
        else
                msg_already_running CUPS
-               exit 1
        fi
-        ;;
+       ;;
   stop)
-        # Stop daemons.
-       if [ -f /var/lock/subsys/cupsd ]; then
+       # Stop daemons.
+       if [ -f /var/lock/subsys/cups ]; then
                msg_stopping CUPS
                killproc cupsd
-               rm -f /var/lock/subsys/cupsd >/dev/null 2>&1
+               rm -f /var/lock/subsys/cups >/dev/null 2>&1
        else
                msg_not_running CUPS
-               exit 1
        fi      
-        ;;
+       ;;
   restart)
-        $0 stop
+       $0 stop
        $0 start
-        ;;
-  reload)
-       if [ -f /var/lock/subsys/cupsd ]; then
+       exit $?
+       ;;
+  reload|force-reload)
+       if [ -f /var/lock/subsys/cups ]; then
                msg_reloading CUPS
-               busy
                killproc cupsd -HUP
+               RETVAL=$?
        else
-               msg_not_running CUPS
-               exit 1
+               msg_not_running CUPS >&2
+               exit 7
        fi
        ;;
-  force-reload)
-       # if program allows reloading without stopping
-       $0 reload
-       exit $?
-
-       # or if it doesn't
-       $0 stop && $0 start
-       exit $?
-       ;;
   status)
-       status cupsd
+       status cups cupsd
        exit $?
-        ;;
+       ;;
   *)
-        # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
-       msg_usage "$0 {start|stop|status|restart|reload|force-reload}"
-        exit 1
+       # show "Usage: %s {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL