aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lewis <nerf@judo.za.org>2014-05-23 21:33:26 +0200
committerAndrew Lewis <nerf@judo.za.org>2014-05-23 21:33:26 +0200
commitd8d43e85eb807942f3b997a6c8ab6c5e295693ca (patch)
tree6c12921e7b9c17f28883f3a1b2dce06457d4ef92
parentf73f91e1f1f1b9f2825e292af7427aef0c9dac62 (diff)
downloadrspamd-d8d43e85eb807942f3b997a6c8ab6c5e295693ca.tar.gz
rspamd-d8d43e85eb807942f3b997a6c8ab6c5e295693ca.zip
Avoid redefining hardcoded defaults in RBL plugin
-rw-r--r--conf/modules.conf4
-rw-r--r--src/plugins/lua/rbl.lua4
2 files changed, 6 insertions, 2 deletions
diff --git a/conf/modules.conf b/conf/modules.conf
index d7f396b47..2b3b1a7d3 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 bdfe3500b..3738af3cf 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