MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2025-02-24 15:35:17 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

update

Browse source 
none
This commit is contained in:
Jerry.Benton 2016-05-02 05:11:12 -04:00
parent 0081af3fec
commit 2c8dfea4b9
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/usr/share/MailScanner/perl/MailScanner/SweepViruses.pm
View file

@ -202,9 +202,9 @@ sub initialise {
($installed{'clamd'} ||
$installed{'clamavmodule'});
$scannerlist = join(' ', keys %installed);
MailScanner::Log::InfoLog("Found virus scanners: %s ", $scannerlist);
MailScanner::Log::InfoLog("Auto: Found virus scanners: %s ", $scannerlist);
if ($scannerlist =~ /^\s*$/) {
MailScanner::Log::WarnLog("Warning: no virus scanners found");
MailScanner::Log::WarnLog("Warning: no virus scanners found via auto select");
#print STDERR "No virus scanners found to be installed at all!\n";
$scannerlist = "none";
}

21
common/var/lib/MailScanner/init/ms-init
View file

@ -201,7 +201,7 @@ do_stop()
if [ "x$PID" = "x" ]; then
RETVAL=9
else
ps wwp $PID|grep -q [M]ailScanner > /dev/null 2>&1
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
RETVAL="$?"
fi
@ -235,10 +235,9 @@ do_stop()
fi
else
# MailScanner is not running
echo "not running"
# kill any rogue processes
kill $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
# these should not exist if the process is stopped, so they
# are removed if they do exist
@ -310,7 +309,7 @@ case "$1" in
PID=$(head -n 1 $PIDFILE)
# check to see if running and belongs to mailscanner
ps wwp $PID|grep -q [M]ailScanner > /dev/null 2>&1
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
# get the return
RETVAL="$?"
@ -321,7 +320,7 @@ case "$1" in
exit 0
else
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Found a dead PID. Stopping all $NAME rogue processes ..."
kill -15 $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
rm -f $PIDFILE
fi
fi
@ -366,7 +365,7 @@ case "$1" in
echo "$NAME started with process id $PID"
else
logger -i -p mail.notice "$NAME failed to start"
kill -15 $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
exit 1
fi
@ -429,7 +428,7 @@ case "$1" in
PID=$(head -n 1 $PIDFILE)
# check to see if running and belongs to mailscanner
ps wwp $PID|grep -q [M]ailScanner > /dev/null 2>&1
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
# get the return
RETVAL="$?"
@ -441,7 +440,7 @@ case "$1" in
else
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Found a dead PID. Killing all $NAME rogue processes ..."
echo "$NAME had a dead PID. Any rogue processes were killed."
kill -15 $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
rm -f $PIDFILE
fi
fi
@ -467,7 +466,7 @@ case "$1" in
else
logger -i -p mail.notice "$NAME failed to start"
echo "$NAME failed to start ... doh!"
kill $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
exit 1
fi
@ -490,7 +489,7 @@ case "$1" in
else
logger -i -p mail.notice "$NAME failed to start"
echo "$NAME failed to start ... doh!"
kill $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
exit 1
fi
@ -499,7 +498,7 @@ case "$1" in
kill)
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Killing $NAME "
echo "Killing $NAME and children ... mwa ha ha ha!"
kill -9 $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
kill -9 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
# remove subsys
if [ -f /var/lock/subsys/MailScanner ] ; then