diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-05-24 04:40:02 -0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-05-24 04:40:02 -0400 |
| commit | e3329afcefadb0c6d609ec02cf3df9dc6728406e (patch) | |
| tree | c10152bd1f22ca456d37be8f8cb55c83fdb1533e | |
| parent | 093117ff38b20219e2b04d5bfff25fc208f35d67 (diff) | |
| parent | d8d43e85eb807942f3b997a6c8ab6c5e295693ca (diff) | |
| download | rspamd-e3329afcefadb0c6d609ec02cf3df9dc6728406e.tar.gz rspamd-e3329afcefadb0c6d609ec02cf3df9dc6728406e.zip | |
Merge pull request #77 from fatalbanana/master
Avoid redefining hardcoded defaults in RBL plugin
| -rw-r--r-- | conf/modules.conf | 4 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/conf/modules.conf b/conf/modules.conf index 160680fd2..9d33430e2 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 |