diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2015-02-17 13:12:05 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2015-02-17 13:14:10 +0200 |
| commit | 9e1b3fd96d6313535e02cb9ece8a90c0cb0062b2 (patch) | |
| tree | a38df5c1b360fcacbe4f8c029fe2365d6da8d833 | |
| parent | 28f55f0cbed039eba244c2c829136f8d09f75c08 (diff) | |
| download | rspamd-9e1b3fd96d6313535e02cb9ece8a90c0cb0062b2.tar.gz rspamd-9e1b3fd96d6313535e02cb9ece8a90c0cb0062b2.zip | |
Since exclude_private_ips requires config to change behaviour now we can make it default true
| -rw-r--r-- | conf/modules.conf | 1 | ||||
| -rw-r--r-- | doc/markdown/modules/rbl.md | 2 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/conf/modules.conf b/conf/modules.conf index 1fd71f2ed..6310f4326 100644 --- a/conf/modules.conf +++ b/conf/modules.conf @@ -87,7 +87,6 @@ rbl { default_from = true; default_received = false; default_exclude_users = true; - default_exclude_private_ips = true; private_ips = "127.0.0.0/8 10.0.0.0/8 192.168.0.0/16 169.254.0.0/16 172.16.0.0/12 100.64.0.0/10 fc00::/7 fe80::/10 fec0::/10 ::1"; diff --git a/doc/markdown/modules/rbl.md b/doc/markdown/modules/rbl.md index 67f495892..6ffb46cda 100644 --- a/doc/markdown/modules/rbl.md +++ b/doc/markdown/modules/rbl.md @@ -57,7 +57,7 @@ If set to false, do not yield a result unless the response received from the RBL If set to true, do not use this RBL if the message sender is authenticated. -- default_exclude_private_ips (false) +- default_exclude_private_ips (true) If true & private_ips is set appropriately, do not use the RBL if the sending host address is in the private IP list & do not check received headers baring these addresses. diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index 852fe1f04..792c92569 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -327,7 +327,7 @@ if(opts['default_exclude_users'] == nil) then opts['default_exclude_users'] = false end if(opts['default_exclude_private_ips'] == nil) then - opts['default_exclude_private_ips'] = false + opts['default_exclude_private_ips'] = true end if(opts['default_exclude_local'] == nil) then opts['default_exclude_local'] = true |