[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 984ffa613ab33088591def65be12cc286c62af6f
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Mar 26 23:17:25 2009 -0400

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

diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 356df2c..eb1a860 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -107,7 +107,6 @@ case "$1" in
     [ -z "$AllowSupplementaryGroups" -o -n "$AddGroups" ] && AllowSupplementaryGroups=true
     [ -z "$ReadTimeout" ] && ReadTimeout="120"
     [ -z "$Foreground" ] && Foreground="false"
-    [ -z "$Chroot" ] && Chroot="false"
     [ -z "$PidFile" ] && PidFile="/var/run/clamav/clamav-milter.pid"
     [ -z "$ClamdSocket" ] && ClamdSocket="unix:/var/run/clamav/clamd.ctl"
     [ -z "$OnClean" ] && OnClean="Accept"
@@ -127,7 +126,6 @@ User $User
 AllowSupplementaryGroups $AllowSupplementaryGroups
 ReadTimeout $ReadTimeout
 Foreground $Foreground
-Chroot $Chroot
 PidFile $PidFile
 ClamdSocket $ClamdSocket
 OnClean $OnClean
@@ -140,6 +138,12 @@ LogVerbose $LogVerbose
 LogInfected $LogInfected
 MaxFileSize $MaxFileSize
 EOF
+    if [ -n "$Chroot" ]; then
+      cat >> $DEBCONFFILE << EOF
+Chroot $Chroot
+EOF
+    fi
+
     if [ -n "$LocalNet" ]; then
       cat >> $DEBCONFFILE << EOF
 LocalNet $LocalNet
@@ -169,7 +173,7 @@ EOF
 EOF
     fi
 
-    if [ -n "$LogFile" ]; then
+    if [ -n "$LogFile" ] && [ "$LogFile" != 'none' ]; then
       echo "LogFile $LogFile" >> $DEBCONFFILE
       echo "LogTime $LogTime" >> $DEBCONFFILE
       echo "LogFileUnlock $LogFileUnlock" >> $DEBCONFFILE

-- 
Debian repository for ClamAV