[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-466-ga4903a4

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit a68bebcd7565490b76d2c796a8f165a696c1c7e4
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 25 13:23:11 2009 +0100

    Handle new option LogInfected
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index 5a12664..b781c00 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -105,6 +105,9 @@ fi
 if [ "$LogVerbose" = "true" ]; then
   db_set clamav-milter/LogVerbose true || true
 fi
+if [ -n "$LogInfected" ]; then
+  db_set clamav-milter/LogInfected "$LogInfected" || true
+fi
 if [ -n "$MaxFileSize" ]; then
   MaxFileSize="`echo $MaxFileSize | sed -e s/M//`"
   db_set clamav-milter/MaxFileSize "$MaxFileSize" || true
@@ -404,18 +407,28 @@ StateLogVerbose()
 {
   db_input low clamav-milter/LogVerbose || true
   if db_go; then
-    STATE="MaxFileSize"
+    STATE="LogInfected"
   else
     STATE="LogFacility"
   fi
 }
 
+StateLogInfected()
+{
+  db_input low clamav-milter/LogInfected || true
+  if db_go; then
+    STATE="MaxFileSize"
+  else
+    STATE="LogVerbose"
+  fi
+}
+
 StateMaxFileSize()
 {
   if inputdigit low clamav-milter/MaxFileSize ; then
     STATE="End"
   else
-    STATE="LogVerbose"
+    STATE="LogInfected"
   fi
 }
 
@@ -513,6 +526,9 @@ while [ "$STATE" != "End" ]; do
     "LogVerbose")
     StateLogVerbose
     ;;
+    "LogInfected")
+    StateLogInfected
+    ;;
     "MaxFileSize")
     StateMaxFileSize
     ;;
diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index 27d7032..9b2bd10 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -209,6 +209,14 @@ Type: boolean
 Default: false
 _Description: Enable verbose logging.
 
+Template: clamav-milter/LogInfected
+Type: select
+Choices: Off, Basic, Full
+Default: Off
+_Description: This option allows to tune what is logged when a message is infected.
+ Possible values are Off (the default - nothing is logged), Basic (minimal info
+ logged), Full (verbose info logged)
+
 Template: clamav-milter/MaxFileSize
 Type: string
 Default: 25M

-- 
Debian repository for ClamAV