From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 23 May 2014 19:33:26 +0000 (+0200)
Subject: Avoid redefining hardcoded defaults in RBL plugin
X-Git-Tag: 0.7.0~207^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8d43e85eb807942f3b997a6c8ab6c5e295693ca;p=thirdparty%2Frspamd.git

Avoid redefining hardcoded defaults in RBL plugin
---

diff --git a/conf/modules.conf b/conf/modules.conf
index d7f396b472..2b3b1a7d3e 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -83,6 +83,10 @@ surbl {
     }
 }
 rbl {
+
+ default_from = true;
+ default_received = false;
+
  rbls {
 	
 	spamhaus {
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index bdfe3500b7..3738af3cf5 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -120,10 +120,10 @@ if(opts['default_ipv6'] == nil) then
 	opts['default_ipv6'] = false
 end
 if(opts['default_received'] == nil) then
-	opts['default_received'] = false
+	opts['default_received'] = true
 end
 if(opts['default_from'] == nil) then
-	opts['default_from'] = true
+	opts['default_from'] = false
 end
 if(opts['default_unknown'] == nil) then
 	opts['default_unknown'] = false