[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 8e5019fae3e832809ee431e50a4988906642d786
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Mar 26 22:28:57 2009 -0400

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

diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index e7d5459..83ba53b 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -104,15 +104,12 @@ case "$1" in
     [ -z "$AllowSupplementaryGroups" -o -n "$AddGroups" ] && AllowSupplementaryGroups=true
     [ -z "$ReadTimeout" ] && ReadTimeout="120"
     [ -z "$Foreground" ] && Foreground="false"
-    [ -z "$Chroot" ] && Chroot=""
+    [ -z "$Chroot" ] && Chroot="false"
     [ -z "$PidFile" ] && PidFile="/var/run/clamav/clamav-milter.pid"
     [ -z "$ClamdSocket" ] && ClamdSocket="unix:/var/run/clamav/clamd.ctl"
-    [ -z "$LocalNet" ] && LocalNet=""
-    [ -z "$Whitelist" ] && WhiteList=""
     [ -z "$OnClean" ] && OnClean="Accept"
     [ -z "$OnInfected" ] && OnInfected="Quarantine"
     [ -z "$OnFail" ] && OnFail="Defer"
-    [ -z "$RejectMsg" ] && RejectMsg=""
     [ -z "$AddHeader" ] && AddHeader="false"
     [ -z "$LogSyslog" ] && LogSyslog="false"
     [ -z "$LogFacility" ] && LogFacility="LOG_LOCAL6"
@@ -130,12 +127,9 @@ Foreground $Foreground
 Chroot $Chroot
 PidFile $PidFile
 ClamdSocket $ClamdSocket
-LocalNet $LocalNet
-Whitelist $Whitelist
 OnClean $OnClean
 OnInfected $OnInfected
 OnFail $OnFail
-RejectMsg $RejectMsg
 AddHeader $AddHeader
 LogSyslog $LogSyslog
 LogFacility $LogFacility
@@ -143,6 +137,24 @@ LogVerbose $LogVerbose
 LogInfected $LogInfected
 MaxFileSize $MaxFileSize
 EOF
+    if [ -n "$LocalNet" ]; then
+      cat >> $DEBCONFFILE << EOF
+LocalNet $LocalNet
+EOF
+    fi
+
+    if [ -n "$Whitelist" ]; then
+      cat >> $DEBCONFFILE << EOF
+Whitelist $Whitelist
+EOF
+    fi
+
+    if [ -n "$RejectMsg" ]; then
+      cat >> $DEBCONFFILE << EOF
+RejectMsg $RejectMsg
+EOF
+    fi
+
     if [ -n "$TemporaryDirectory" ]; then
 	cat >> $DEBCONFFILE << EOF
 TemporaryDirectory $TemporaryDirectory

-- 
Debian repository for ClamAV