[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6606-ge4d894b

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit e4d894bcae4cddb255686a632eade75f0c00466b
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Oct 25 23:15:43 2010 +0200

    Extended clamav-milter status check
    
    - check for socket if otherwise found running (closes: #600908)
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 2d944df..b433adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ clamav (0.96.4+dfsg-1) UNRELEASED; urgency=low
   [ Michael Tautschnig ]
   * Debconf translation updates
     - Czech (closes: #600098)
+  * Add additional check for milter socket in status command of milter init
+    script (thanks Chris Moules for proposing a patch, closes: #600908).
   
  -- Michael Tautschnig <mt at debian.org>  Mon, 25 Oct 2010 22:58:36 +0200
 
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index 3efe5e6..6f29b02 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -214,7 +214,12 @@ case "$1" in
   ;;
   status)
   status_of_proc "$DAEMON" "$NAME"
-  exit $?
+  ret=$?
+  if [ $ret = 0 ] && [ ! -S $SOCKET_PATH ] ; then
+    log_failure_msg "$NAME is running but socket is missing"
+    exit 4
+  fi
+  exit $ret
   ;;
   *)
   log_failure_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2

-- 
Debian repository for ClamAV