--- a/dnsbl.conf	Thu Sep 06 09:50:05 2007 -0700
+++ b/dnsbl.conf	Sun Sep 23 11:20:12 2007 -0700
@@ -1,9 +1,7 @@
 context main-default {
     // outbound dnsbl filtering to catch our own customers that end up on the sbl
-    dnsbl   localp  partial.blackholes.five-ten-sg.com  "Mail from %s rejected - local; see http://www.five-ten-sg.com/blackhole.php?%s";
-    dnsbl   local   blackholes.five-ten-sg.com  "Mail from %s rejected - local; see http://www.five-ten-sg.com/blackhole.php?%s";
     dnsbl   sbl     sbl-xbl.spamhaus.org        "Mail from %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s";
-    dnsbl_list  local sbl;
+    dnsbl_list  sbl;
 
     // outbound content filtering to prevent our own customers from sending spam
     content on {
@@ -37,7 +35,7 @@
 context main {
     dnsbl   localp  partial.blackholes.five-ten-sg.com  "Mail from %s rejected - local; see http://www.five-ten-sg.com/blackhole.php?%s";
     dnsbl   local   blackholes.five-ten-sg.com  "Mail from %s rejected - local; see http://www.five-ten-sg.com/blackhole.php?%s";
-    dnsbl   sbl     sbl-xbl.spamhaus.org        "Mail from %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s";
+    dnsbl   sbl     zen.spamhaus.org            "Mail from %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s";
     dnsbl   xbl     xbl.spamhaus.org            "Mail from %s rejected - xbl; see http://www.spamhaus.org/query/bl?ip=%s";
     dnsbl_list  local sbl;
 
@@ -60,8 +58,7 @@
     env_to {
         # !! replace this with your domain names
         # child contexts are not allowed to specify recipient addresses outside these domains
-        # or leave this empty to allow unrestricted child contexts
-        # example.com;
+        include "/etc/mail/local-host-names";
     };
 
     context whitelist {
@@ -76,6 +73,7 @@
     context abuse {
         dnsbl_list xbl;
         content off {};
+        generic "^$ " " ";      # regex cannot match, to disable generic rdns rejects
         env_to {
             abuse@              # no content filtering on abuse reports
             postmaster@         # ""
@@ -86,6 +84,7 @@
     context minimal {
         dnsbl_list sbl;
         content on {};
+        spamassassin 10;
         generic "^$ " " ";      # regex cannot match, to disable generic rdns rejects
         env_to {
         };