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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 09f7894a08f26c2dbb70850da1c42019f0c1dc64
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Mar 26 23:17:02 2009 -0400

    Some string handling fixups
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index 62f17ef..b4ca08e 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -130,9 +130,11 @@ 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
+  MaxFileSize="`echo $RET | sed -e s/M//g`"
+else
+  MaxFileSize=25
 fi
+db_set clamav-milter/MaxFileSize "$MaxFileSize" || true
 
 # Functions
 
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 06b54bf..356df2c 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -89,7 +89,12 @@ case "$1" in
     db_metaget clamav-milter/LogInfected value || true
     LogInfected="$RET"
     db_metaget clamav-milter/MaxFileSize value || true
-    MaxFileSize="${RET}M"
+    maxfilesize="`echo $RET | sed -e s/M//g`"
+    MaxFileSize="${maxfilesize}M"
+
+    if [ -z "$LogFile" ] || [ "$LogFile" = 'none' ]; then
+      LogSyslog=true
+    fi
 
     slurp_config "$CLAMAVMILTERCONF"
     

-- 
Debian repository for ClamAV