# HG changeset patch # User Michael Schloh von Bennewitz # Date 1257188839 -3600 # Node ID e3fb635fcb8eb299d95613fcb0bd670d026ca0bd # Parent dc6d3ff779e4acb65199ffde12e3b90ab3229dd9 Correct clamav-milter start block run command logic. diff -r dc6d3ff779e4 -r e3fb635fcb8e clamav/clamav.spec --- a/clamav/clamav.spec Mon Nov 02 19:25:22 2009 +0100 +++ b/clamav/clamav.spec Mon Nov 02 20:07:19 2009 +0100 @@ -32,7 +32,7 @@ Group: AntiVirus License: GPL Version: 0.95.3 -Release: 20091101 +Release: 20091102 # package options %option with_milter no diff -r dc6d3ff779e4 -r e3fb635fcb8e clamav/rc.clamav --- a/clamav/rc.clamav Mon Nov 02 19:25:22 2009 +0100 +++ b/clamav/rc.clamav Mon Nov 02 20:07:19 2009 +0100 @@ -17,6 +17,7 @@ %common clamav_cfgfile="@l_prefix@/etc/clamav/clamd.conf" + clamav_milter_cfgfile="@l_prefix@/etc/clamav/clamav-milter.conf" clamav_pidfile_clamd="@l_prefix@/var/clamav/clamd.pid" clamav_pidfile_clamav_milter="@l_prefix@/var/clamav/clamav-milter.pid" clamav_signal () { @@ -50,12 +51,8 @@ elif [ ".$daemon" = ".clamav-milter" -a -x @l_prefix@/sbin/clamav-milter ]; then ( umask 002 @l_prefix@/sbin/clamav-milter \ - --config-file=$clamav_cfgfile \ - --max-children=4 --outgoing --local \ - --pidfile=$clamav_pidfile_clamav_milter \ - --sendmail-cf=/dev/null \ - $clamav_clamav_milter_flags \ - local:@l_prefix@/var/milter/socket/clamav-milter + --config-file=$clamav_milter_cfgfile \ + $clamav_clamav_milter_flags ) || exit $? fi done