diff options
| -rw-r--r-- | security/clamav/files/clamav-milter.in | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in index c43201c3549..eed56b4e4b5 100644 --- a/security/clamav/files/clamav-milter.in +++ b/security/clamav/files/clamav-milter.in @@ -36,21 +36,23 @@ start_precmd() fi rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket" - echo -n "Waiting for clamd socket.. " - i=${clamav_milter_socktimeout} - while [ $i -ne 0 ] - do - [ -S "$clamav_clamd_socket" ] && break - if [ `expr $i % 10` -eq 0 ]; then - echo -n "${i}.. " + if checkyesno clamav_clamd_enable; then + echo -n "Waiting for clamd socket.. " + i=${clamav_milter_socktimeout} + while [ $i -ne 0 ] + do + [ -S "$clamav_clamd_socket" ] && break + if [ `expr $i % 10` -eq 0 ]; then + echo -n "${i}.. " + fi + sleep 1 + i=$(($i-1)) + done + echo + if [ $i -eq 0 ]; then + echo "There is no clamd socket (${clamav_clamd_socket})!" + exit 1 fi - sleep 1 - i=$(($i-1)) - done - echo - if [ $i -eq 0 ]; then - echo "There is no clamd socket (${clamav_clamd_socket})!" - exit 1 fi } @@ -58,8 +60,10 @@ start_precmd() load_rc_config $name : ${clamav_milter_enable="NO"} : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"} -: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} : ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"} : ${clamav_milter_socktimeout="60"} +: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} +: ${clamav_clamd_enable="NO"} + run_rc_command "$1" |