From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 24 May 2014 08:40:02 +0000 (-0400)
Subject: Merge pull request #77 from fatalbanana/master
X-Git-Tag: 0.7.0~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3329afcefadb0c6d609ec02cf3df9dc6728406e;p=thirdparty%2Frspamd.git

Merge pull request #77 from fatalbanana/master

Avoid redefining hardcoded defaults in RBL plugin
---

e3329afcefadb0c6d609ec02cf3df9dc6728406e
diff --cc conf/modules.conf
index 160680fd24,2b3b1a7d3e..9d33430e2e
--- a/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";