qpsmtpd/sme10/qpsmtpd-0.84-make-dnsbl-more-whitelist_soft-aware.patch

diff -Nur qpsmtpd-0.84.old/plugins/dnsbl qpsmtpd-0.84.bz8327/plugins/dnsbl
--- qpsmtpd-0.84.old/plugins/dnsbl      2014-12-26 14:51:29.018215638 +0100
+++ qpsmtpd-0.84.bz8327/plugins/dnsbl   2014-12-26 15:13:01.032091806 +0100
@@ -179,6 +179,27 @@
   }
 
   my $note = $self->process_sockets;
+
+# Check for whitelisthelo from whitelist_soft
+    my $whitehelo = $connection->notes('whitelisthelo');
+    if ($whitehelo) {
+      $self->log(LOGINFO, "Whitelisthelo found $whitehelo");
+      return OK;
+      }
+    else {
+      $self->log(LOGINFO, "Whitelisthelo not found");
+    }
+
+# Check for whitelistsender from whitelist_soft
+    my $whitesender = $transaction->notes('whitelistsender');
+    if ($whitesender) {
+      $self->log(LOGINFO, "Whitelistsender found $whitesender");
+      return OK;
+      }
+    else {
+      $self->log(LOGINFO, "Whitelistsender not found");
+     }
+
   my $whitelist = $connection->notes('whitelisthost');
   if ( $note ) {
     if ( $rcpt->user =~ /^(?:postmaster|abuse|mailer-daemon|root)$/i ) {
1	diff -Nur qpsmtpd-0.84.old/plugins/dnsbl qpsmtpd-0.84.bz8327/plugins/dnsbl
2	--- qpsmtpd-0.84.old/plugins/dnsbl 2014-12-26 14:51:29.018215638 +0100
3	+++ qpsmtpd-0.84.bz8327/plugins/dnsbl 2014-12-26 15:13:01.032091806 +0100
4	@@ -179,6 +179,27 @@
5	}
6
7	my $note = $self->process_sockets;
8	+
9	+# Check for whitelisthelo from whitelist_soft
10	+ my $whitehelo = $connection->notes('whitelisthelo');
11	+ if ($whitehelo) {
12	+ $self->log(LOGINFO, "Whitelisthelo found $whitehelo");
13	+ return OK;
14	+ }
15	+ else {
16	+ $self->log(LOGINFO, "Whitelisthelo not found");
17	+ }
18	+
19	+# Check for whitelistsender from whitelist_soft
20	+ my $whitesender = $transaction->notes('whitelistsender');
21	+ if ($whitesender) {
22	+ $self->log(LOGINFO, "Whitelistsender found $whitesender");
23	+ return OK;
24	+ }
25	+ else {
26	+ $self->log(LOGINFO, "Whitelistsender not found");
27	+ }
28	+
29	my $whitelist = $connection->notes('whitelisthost');
30	if ( $note ) {
31	if ( $rcpt->user =~ /^(?:postmaster\|abuse\|mailer-daemon\|root)$/i ) {