diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/221spf smeserver-qpsmtpd-2.4.0_bz9654/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/221spf --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/221spf 2016-07-12 21:49:30.065446838 +0200 +++ smeserver-qpsmtpd-2.4.0_bz9654/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/221spf 2016-07-12 21:53:36.271353644 +0200 @@ -1 +1 @@ -sender_permitted_from reject 1 no_dmarc_policy { $qpsmtpd{SPFRejectPolicy} || '1' } +sender_permitted_from reject 1 no_dmarc_policy { $qpsmtpd{SPFRejectPolicy} || '0' } diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc smeserver-qpsmtpd-2.4.0_bz9654/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc --- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 2016-07-12 21:49:30.074446834 +0200 +++ smeserver-qpsmtpd-2.4.0_bz9654/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 2016-07-12 21:51:46.113394906 +0200 @@ -1 +1 @@ -dmarc reject { (( $qpsmtpd{DMARCReject} || 'enabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} || 'enabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' } +dmarc reject { (( $qpsmtpd{DMARCReject} || 'disabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} || 'enabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' }