diff --git a/lib/Qpsmtpd/Plugin.pm b/lib/Qpsmtpd/Plugin.pm index 4e0226f..a72cc86 100644 --- a/lib/Qpsmtpd/Plugin.pm +++ b/lib/Qpsmtpd/Plugin.pm @@ -224,7 +224,7 @@ sub get_reject { my $reject = $self->{_args}{reject}; if (defined $reject && !$reject) { - $self->log(LOGINFO, "fail, reject disabled" . $log_mess); + $self->log(LOGINFO, "fail, tolerated" . $log_mess); return DECLINED; } diff --git a/log/summarize b/log/summarize index 539e5d3..51270c3 100755 --- a/log/summarize +++ b/log/summarize @@ -314,6 +314,7 @@ sub show_symbol { return ' o' if $mess eq 'TLS setup returning'; return ' o' if $mess eq 'pass'; return ' -' if $mess eq 'skip'; + return ' x' if 'fail, tolerated' eq substr($mess, 0, 15); return ' X' if $mess eq 'fail'; return ' -' if $mess =~ /^skip[,:\s]/i; return ' o' if $mess =~ /^pass[,:\s]/i; diff --git a/plugins/helo b/plugins/helo index b5d7fb3..0123471 100644 --- a/plugins/helo +++ b/plugins/helo @@ -246,7 +246,7 @@ sub helo_handler { my ($self, $transaction, $host) = @_; if (!$host) { - $self->log(LOGINFO, "fail, no helo host"); + $self->log(LOGINFO, "fail, tolerated, no helo host"); return DECLINED; } diff --git a/plugins/resolvable_fromhost b/plugins/resolvable_fromhost index aa881a3..9804705 100644 --- a/plugins/resolvable_fromhost +++ b/plugins/resolvable_fromhost @@ -116,7 +116,7 @@ sub hook_mail { return Qpsmtpd::DSN->temp_resolver_failed($self->get_reject_type(), ''); } - $self->log(LOGINFO, 'fail, missing result, reject disabled'); + $self->log(LOGINFO, 'fail, tolerated, missing result'); return DECLINED; }; @@ -127,7 +127,7 @@ sub hook_mail { if (!$self->{_args}{reject}) { ; - $self->log(LOGINFO, "fail, reject disabled, $result"); + $self->log(LOGINFO, "fail, tolerated, $result"); return DECLINED; } diff --git a/plugins/spamassassin b/plugins/spamassassin index 7d7f734..342c788 100644 --- a/plugins/spamassassin +++ b/plugins/spamassassin @@ -178,7 +178,7 @@ sub data_post_handler { if ($transaction->data_size > 500_000) { $self->log(LOGINFO, - "skip: too large (" . $transaction->data_size . ")"); + "skip, too large (" . $transaction->data_size . ")"); return (DECLINED); } @@ -424,7 +424,7 @@ sub reject { if ($score < $reject) { if ($ham_or_spam eq 'Spam') { - $self->log(LOGINFO, "fail, $status < $reject, $learn"); + $self->log(LOGINFO, "fail, tolerated, $status < $reject, $learn"); return DECLINED; } else {