smeserver-qpsmtpd/sme10/smeserver-qpsmtpd-2.6.0-set_dkim_option_after_key.patch

diff -Nur smeserver-qpsmtpd-2.6.0/root/sbin/e-smith/qpsmtpd-print-dns smeserver-qpsmtpd-2.6.0_bz9496/root/sbin/e-smith/qpsmtpd-print-dns
--- smeserver-qpsmtpd-2.6.0/root/sbin/e-smith/qpsmtpd-print-dns 2016-05-16 12:13:47.132491438 +0200
+++ smeserver-qpsmtpd-2.6.0_bz9496/root/sbin/e-smith/qpsmtpd-print-dns  2016-05-16 12:15:31.996517912 +0200
@@ -27,7 +27,7 @@
 
 _EOF
 
-my $key_string = "v=DKIM1;o=~;t=y;r=dmarc-feedback\@$domain;p=";
+my $key_string = "v=DKIM1;p=";
 open PUBKEY, "/var/service/qpsmtpd/config/dkim/$domain/public";
 while(<PUBKEY>){
   next if /^\-/;
@@ -35,6 +35,7 @@
   $key_string .= $_;
 }
 close PUBKEY;
+$key_string .= ";o=~;t=y;r=dmarc-feedback\@$domain";
 open SEL, "/var/service/qpsmtpd/config/dkim/$domain/selector";
 my $selector = <SEL>;
 chomp $selector;
1	diff -Nur smeserver-qpsmtpd-2.6.0/root/sbin/e-smith/qpsmtpd-print-dns smeserver-qpsmtpd-2.6.0_bz9496/root/sbin/e-smith/qpsmtpd-print-dns
2	--- smeserver-qpsmtpd-2.6.0/root/sbin/e-smith/qpsmtpd-print-dns 2016-05-16 12:13:47.132491438 +0200
3	+++ smeserver-qpsmtpd-2.6.0_bz9496/root/sbin/e-smith/qpsmtpd-print-dns 2016-05-16 12:15:31.996517912 +0200
4	@@ -27,7 +27,7 @@
5
6	_EOF
7
8	-my $key_string = "v=DKIM1;o=~;t=y;r=dmarc-feedback\@$domain;p=";
9	+my $key_string = "v=DKIM1;p=";
10	open PUBKEY, "/var/service/qpsmtpd/config/dkim/$domain/public";
11	while(<PUBKEY>){
12	next if /^\-/;
13	@@ -35,6 +35,7 @@
14	$key_string .= $_;
15	}
16	close PUBKEY;
17	+$key_string .= ";o=~;t=y;r=dmarc-feedback\@$domain";
18	open SEL, "/var/service/qpsmtpd/config/dkim/$domain/selector";
19	my $selector = <SEL>;
20	chomp $selector;