[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/lenny-security, updated. debian/0.94.dfsg.2-1lenny1-5-g80c870b

[Stephen Gran]

The following commit has been merged in the debian/lenny-security branch:
commit 80c870bb0577423ea52fe2451f158ce7bcf3f324
Author: Stephen Gran <steve at lobefin.net>
Date:   Fri Apr 24 23:44:33 2009 +0100

    Revert "Some changes to the milter init script"
    
    This reverts commit 517865b85d1361efc7f65eb9098be9c25d5b62dc.

diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index eed2814..13e57c7 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -17,48 +17,25 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/clamav-milter
 DESC="Sendmail milter plugin for ClamAV"
 BASENAME=clamav-milter
-CLAMAVCONF=/etc/clamav/clamav-milter.conf
+CLAMAVCONF=/etc/clamav/clamd.conf
 DEFAULT=/etc/default/clamav-milter
+OPTIONS="-dq"
 SUPERVISOR=/usr/bin/daemon
 SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
 SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$BASENAME --respawn"
 CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
 
 [ -x "$DAEMON" ] || exit 0
-[ ! -r $DEFAULT ] || . $DEFAULT
+[ -r "$CLAMAVCONF" ] || exit 0
+[ -r "$DEFAULT" ] && . $DEFAULT
+[ -z "$PIDFILE" ] && PIDFILE=/var/run/clamav/clamav-milter.pid
+[ -z "$SOCKET" ] && SOCKET=local:/var/run/clamav/clamav-milter.ctl
 
 . /lib/lsb/init-functions
 
-if [ ! -f "$CLAMAVCONF" ]; then
-  log_failure_msg "There is no configuration file for clamav-milter."
-  log_failure_msg "Please either dpkg-reconfigure $DESC, or copy the example from"
-  log_failure_msg "/usr/share/doc/clamav-milter/examples/ to $CLAMAVCONF and run"
-  log_failure_msg "'/etc/init.d/clamav-milter start'"
-  exit 0
-fi
-
 #COMMON-FUNCTIONS#
 
 slurp_config "$CLAMAVCONF"
-[ -n "$User" ] || User=clamav
-
-if [ -n "$Example" ]; then
-  log_failure_msg "$DESC is not configured."
-  log_failure_msg "Please edit $CLAMAVCONF and run '/etc/init.d/clamav-milter start'"
-  exit 0
-fi
-
-if [ -z "$PidFile" ]; then
-  PIDFILE=/var/run/clamav/clamav-milter.pid
-else
-  PIDFILE="$PidFile"
-fi
-
-if [ -z "$MilterSocket" ]; then
-  SOCKET=local:/var/run/clamav/clamav-milter.ctl
-else
-  SOCKET="$MilterSocket"
-fi
 
 case "$SOCKET" in
   /*)
@@ -98,13 +75,7 @@ fi
 [ -n "$DataBaseDirectory" ] || DataBaseDirectory=/var/run/clamav
 
 make_dir "$DataBaseDirectory"
-if [ "${SOCKET_PATH#inet}" = "${SOCKET_PATH}" ]; then
-  make_dir $(dirname "$SOCKET_PATH")
-  chown $User $(dirname "$SOCKET_PATH")
-fi
-
-make_dir $(dirname "$THEPIDFILE")
-chown $User $(dirname "$THEPIDFILE")
+make_dir $(dirname "$SOCKET_PATH")
 
 case "$1" in
   start)

-- 
Debian repository for ClamAV