- updated to 1.1.23rc1 - fixes two security holes:

[packages/cups.git] / cups.init

diff --git a/cups.init b/cups.init
index a13f86a42136dc8da8cd76deadea546099360aac..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).
 #
@@ -19,7 +19,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 CUPS
                exit 1
        fi
@@ -32,21 +32,21 @@ RETVAL=0
 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
        fi
        ;;
   stop)
        # Stop daemons.
-       if [ -f /var/lock/subsys/cupsd ]; then
+       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
        fi      
@@ -57,7 +57,7 @@ case "$1" in
        exit $?
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/cupsd ]; then
+       if [ -f /var/lock/subsys/cups ]; then
                msg_reloading CUPS
                killproc cupsd -HUP
                RETVAL=$?
@@ -67,7 +67,7 @@ case "$1" in
        fi
        ;;
   status)
-       status cupsd
+       status cups cupsd
        exit $?
        ;;
   *)