smeserver-qpsmtpd/sme9/smeserver-qpsmtpd-2.4.0-fix_disabling_dmarc_reports.patch

diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/crontab/DMARCReports smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/etc/crontab/DMARCReports
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/crontab/DMARCReports 2016-06-17 23:11:10.101051183 +0200
+++ smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/etc/crontab/DMARCReports  2016-06-17 23:12:52.133017185 +0200
@@ -1,8 +1,8 @@
 {
-  if (( $qpsmtpd{DMARCReporting} || '1' ) =~ m/^1|on|enabled|yes$/){
+  if (( $qpsmtpd{DMARCReporting} || 'enabled' ) =~ m/^1|on|enabled|yes$/){
     $OUT .= "15 0 * * * qpsmtpd /usr/bin/dmarc_send_reports\n";
   }
   else{
-    $OUT .= "DMARC Reporting is disabled\n";
+    $OUT .= "# DMARC Reporting is disabled\n";
   }
 }
diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc smeserver-qpsmtpd-2.4.0_bz9206/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-06-17 23:11:10.100051184 +0200
+++ smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc       2016-06-17 23:12:14.620029665 +0200
@@ -1 +1 @@
-dmarc reject { (( $qpsmtpd{DMARCReject} || '1' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} || '1' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' }
+dmarc reject { (( $qpsmtpd{DMARCReject} || 'enabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} || 'enabled' ) =~ m/^1|on|enabled|yes$/) ? '1' : '0' }
1	diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/crontab/DMARCReports smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/etc/crontab/DMARCReports
2	--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/crontab/DMARCReports 2016-06-17 23:11:10.101051183 +0200
3	+++ smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/etc/crontab/DMARCReports 2016-06-17 23:12:52.133017185 +0200
4	@@ -1,8 +1,8 @@
5	{
6	- if (( $qpsmtpd{DMARCReporting} \|\| '1' ) =~ m/^1\|on\|enabled\|yes$/){
7	+ if (( $qpsmtpd{DMARCReporting} \|\| 'enabled' ) =~ m/^1\|on\|enabled\|yes$/){
8	$OUT .= "15 0 * * * qpsmtpd /usr/bin/dmarc_send_reports\n";
9	}
10	else{
11	- $OUT .= "DMARC Reporting is disabled\n";
12	+ $OUT .= "# DMARC Reporting is disabled\n";
13	}
14	}
15	diff -Nur smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc
16	--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 2016-06-17 23:11:10.100051184 +0200
17	+++ smeserver-qpsmtpd-2.4.0_bz9206/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 2016-06-17 23:12:14.620029665 +0200
18	@@ -1 +1 @@
19	-dmarc reject { (( $qpsmtpd{DMARCReject} \|\| '1' ) =~ m/^1\|on\|enabled\|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} \|\| '1' ) =~ m/^1\|on\|enabled\|yes$/) ? '1' : '0' }
20	+dmarc reject { (( $qpsmtpd{DMARCReject} \|\| 'enabled' ) =~ m/^1\|on\|enabled\|yes$/) ? '1' : '0' } reporting { (( $qpsmtpd{DMARCReporting} \|\| 'enabled' ) =~ m/^1\|on\|enabled\|yes$/) ? '1' : '0' }