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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 5c55dc922d586e7662605566012df15cca88dc33
Author: Stephen Gran <steve at lobefin.net>
Date:   Mon Apr 12 23:25:38 2010 +0100

    add new question to milter .config.in
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index 3851e91..4ddb631 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -41,6 +41,9 @@ fi
 if [ -n "$MilterSocket" ]; then
   db_set clamav-milter/MilterSocket "$MilterSocket" || true
 fi
+if [ -n "$MilterSocketGroup" ]; then
+  db_set clamav-milter/MilterSocketGroup "$MilterSocketGroup" || true
+fi
 if [ "$FixStaleSocket" = "true" ]; then
   db_set clamav-milter/FixStaleSocket true || true
 fi
@@ -210,12 +213,26 @@ StateUser()
     if [ "$RET" = "" ]; then
       db_set clamav-milter/User "clamav" || true
     fi
-    STATE="ReadTimeout"
+    STATE="MilterSocketGroup"
   else
     STATE="FixStaleSocket"
   fi
 }
 
+StateMilterSocketGroup()
+{
+  db_input medium clamav-milter/MilterSocketGroup || true
+  if db_go; then
+    db_metaget clamav-milter/MilterSocketGroup value
+    if [ "$RET" = "" ]; then
+      db_set clamav-milter/MilterSocketGroup "clamav" || true
+    fi
+    STATE="ReadTimeout"
+  else
+    STATE="User"
+  fi
+}
+
 StateReadTimeout()
 {
   if inputdigit low clamav-milter/ReadTimeout ; then
@@ -466,6 +483,9 @@ while [ "$STATE" != "End" ]; do
     "ReadTimeout")
     StateReadTimeout
     ;;
+    "MilterSocketGroup")
+    StateMilterSocketGroup
+    ;;
     "Foreground")
     StateForeground
     ;;

-- 
Debian repository for ClamAV