diff --git a/CHANGELOG.md b/CHANGELOG.md index edb0450a..3326c50b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The **patch** part changes incrementally at each release. ### Fixed * evoacme: better error when apache2ctl fails * spamassassin: add missing right for amavis +* amavis: fix output result checking ### Security diff --git a/nagios-nrpe/files/plugins/check_amavis b/nagios-nrpe/files/plugins/check_amavis index d364dba3..306d7f8e 100755 --- a/nagios-nrpe/files/plugins/check_amavis +++ b/nagios-nrpe/files/plugins/check_amavis @@ -65,7 +65,7 @@ $smtp->close(); print "$result\n"; -if ($result =~/2.5.0 Ok, id=[^,]+, BOUNCE/) { +if ($result =~/2.7.0 Ok, discarded, id=[^,]+ - INFECTED: Eicar-Test-Signature/) { print "OK - All fine\n"; exit 0; } else {