Avoid redefining hardcoded defaults in RBL plugin

diff --git a/conf/modules.conf b/conf/modules.conf
index d7f396b472020b7cc0ae69cb1e40e4bddff59ec7..2b3b1a7d3ee3c8a2dd873f4e1ddd3d8ecacd3bd3 100644 (file)
--- 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 bdfe3500b7bc17ba23130d77a563d13f330c27f5..3738af3cf5b2336abc651a2d0d5ee07fbe6b2731 100644 (file)
--- 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