diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15helo mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15helo --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15helo 2016-04-20 21:34:14.628333294 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/15helo 2016-04-20 21:32:51.564340217 +0200 @@ -1 +1 @@ -helo policy { $qpsmtpd{HeloPolicy} || 'rfc' } +helo policy { $qpsmtpd{HeloPolicy} || 'rfc' } reject naughty diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/18karma mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/18karma --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/18karma 2016-04-20 21:34:14.621333294 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/18karma 2016-04-20 21:33:49.056335436 +0200 @@ -1,5 +1,5 @@ { return "# Karma plugin is disabled" unless (($qpsmtpd{Karma} || 'disabled') =~ m/^1|on|yes|enabled$/i); my $negative = $qpsmtpd{KarmaNegative} || '2'; - $OUT .= "karma negative $negative reject connect db_dir /var/lib/qpsmtpd/karma"; + $OUT .= "karma negative $negative reject naughty db_dir /var/lib/qpsmtpd/karma"; } diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/22dnsbl mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/22dnsbl --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/22dnsbl 2008-10-07 17:05:18.000000000 +0200 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/22dnsbl 2016-04-20 21:32:21.955342667 +0200 @@ -1,5 +1,5 @@ { return "# dnsbl disabled" unless (${qpsmtpd}{DNSBL} eq "enabled"); - "dnsbl disconnect"; + "dnsbl reject naughty"; } diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/23naughty mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/23naughty --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/23naughty 1970-01-01 01:00:00.000000000 +0100 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/23naughty 2016-04-20 21:31:21.373347653 +0200 @@ -0,0 +1 @@ +naughty reject mail