- security note

[packages/clamav.git] / clamav.init

diff --git a/clamav.init b/clamav.init
index 8fcdba0989518630cf5935ac23f443e20741bf7d..28b863266efd1c5365c74998cec9a364c3890efc 100644 (file)
--- a/clamav.init
+++ b/clamav.init
@@ -14,39 +14,43 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-# Get network config
-. /etc/sysconfig/network
-
 # Get service config
 [ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/clamd ]; then
                msg_starting clamd
-               daemon /usr/sbin/clamd 
+               daemon /usr/sbin/clamd
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd               
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd
        else
                msg_already_running clamd
        fi
-       ;;
-  stop)
-        if [ -f /var/lock/subsys/clamd ]; then
+}
+
+stop() {
+       if [ -f /var/lock/subsys/clamd ]; then
                msg_stopping clamd
-               killproc clamd
+               killproc --pidfile clamav/clamd.pid clamd
                rm -f /var/run/clamav/clamd.pid /var/lock/subsys/clamd >/dev/null 2>&1
        else
                msg_not_running clamd
-       fi      
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status clamd
@@ -58,7 +62,7 @@ case "$1" in
                killproc clamd -HUP
                RETVAL=$?
        else
-               msg_not_running clamd >&2
+               msg_not_running clamd
                RETVAL=7
        fi
        ;;