Merge pull request #77 from fatalbanana/master

Avoid redefining hardcoded defaults in RBL plugin

diff --cc conf/modules.conf
index 160680fd246f525d5f493cb6c4012509e83ccc3f,2b3b1a7d3ee3c8a2dd873f4e1ddd3d8ecacd3bd3..9d33430e2e855ba2ebb8fdcd6985accbbb69476e
--- 1/conf/modules.conf
--- 2/conf/modules.conf
+++ b/conf/modules.conf
@@@ -83,23 -83,27 +83,27 @@@ surbl 
      }
  }
  rbl {
+ 
+  default_from = true;
+  default_received = false;
+ 
   rbls {
        
 -      spamhaus {
 -              symbol = "RBL_SPAMHAUS";
 -              rbl = "zen.spamhaus.org";
 -              ipv6 = true;
 -              returncodes {
 -              RBL_SPAMHAUS_SBL = "127.0.0.2";
 -              RBL_SPAMHAUS_CSS = "127.0.0.3";
 -              RBL_SPAMHAUS_XBL = "127.0.0.4";
 -              RBL_SPAMHAUS_XBL = "127.0.0.5";
 -              RBL_SPAMHAUS_XBL = "127.0.0.6";
 -              RBL_SPAMHAUS_XBL = "127.0.0.7";
 -              RBL_SPAMHAUS_PBL = "127.0.0.10";
 -              RBL_SPAMHAUS_PBL = "127.0.0.11";
 -              }
 -      }
 +    spamhaus {
 +        symbol = "RBL_SPAMHAUS";
 +        rbl = "zen.spamhaus.org";
 +        ipv6 = true;
 +        returncodes {
 +            RBL_SPAMHAUS_SBL = "127.0.0.2";
 +            RBL_SPAMHAUS_CSS = "127.0.0.3";
 +            RBL_SPAMHAUS_XBL = "127.0.0.4";
 +            RBL_SPAMHAUS_XBL = "127.0.0.5";
 +            RBL_SPAMHAUS_XBL = "127.0.0.6";
 +            RBL_SPAMHAUS_XBL = "127.0.0.7";
 +            RBL_SPAMHAUS_PBL = "127.0.0.10";
 +            RBL_SPAMHAUS_PBL = "127.0.0.11";
 +        }
 +    }
  
      spamhaus_xbl {
         symbol = "RECEIVED_SPAMHAUS_XBL";