[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.95+dfsg-1-244-g4c80685

[Stephen Gran]

The following commit has been merged in the debian/etch-volatile branch:
commit 4c80685c092cf31310da5d8abec422bbb62f2d2e
Author: Stephen Gran <steve at lobefin.net>
Date:   Sun Jun 14 19:17:59 2009 +0100

    Make milter debconf fu work
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index b4ca08e..bf8c4e7 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -89,9 +89,6 @@ fi
 if [ -n "$Whitelist" ]; then
   db_set clamav-milter/Whitelist "$Whitelist" || true
 fi
-if [ -n "$OnClean" ]; then
-  db_set clamav-milter/OnClean "$OnClean" || true
-fi
 if [ -n "$OnInfected" ]; then
   db_set clamav-milter/OnInfected "$OnInfected" || true
 fi
@@ -292,19 +289,9 @@ StateWhitelist()
 {
   db_input low clamav-milter/Whitelist || true
   if db_go; then
-    STATE="OnClean"
-  else
-    STATE="LocalNet"
-  fi
-}
-
-StateOnClean()
-{
-  db_input low clamav-milter/OnClean || true
-  if db_go; then
     STATE="OnInfected"
   else
-    STATE="Whitelist"
+    STATE="LocalNet"
   fi
 }
 
@@ -314,7 +301,7 @@ StateOnInfected()
   if db_go; then
     STATE="OnFail"
   else
-    STATE="OnClean"
+    STATE="Whitelist"
   fi
 }
 
@@ -500,9 +487,6 @@ while [ "$STATE" != "End" ]; do
     "Whitelist")
     StateWhitelist
     ;;
-    "OnClean")
-    StateOnClean
-    ;;
     "OnInfected")
     StateOnInfected
     ;;
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 0747faa..e004b8d 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -62,8 +62,6 @@ case "$1" in
     LocalNet="$RET"
     db_metaget clamav-milter/Whitelist value || true
     Whitelist="$RET"
-    db_metaget clamav-milter/OnClean value || true
-    OnClean="$RET"
     db_metaget clamav-milter/OnInfected value || true
     OnInfected="$RET"
     db_metaget clamav-milter/OnFail value || true
@@ -112,7 +110,7 @@ case "$1" in
     [ -z "$OnClean" ] && OnClean="Accept"
     [ -z "$OnInfected" ] && OnInfected="Quarantine"
     [ -z "$OnFail" ] && OnFail="Defer"
-    [ -z "$AddHeader" ] && AddHeader="false"
+    [ -z "$AddHeader" ] || [ "$AddHeader" = 'false' ] && AddHeader="false"
     [ -z "$LogSyslog" ] && LogSyslog="false"
     [ -z "$LogFacility" ] && LogFacility="LOG_LOCAL6"
     [ -z "$LogVerbose" ] && LogVerbose="false"

-- 
Debian repository for ClamAV