Since exclude_private_ips requires config to change behaviour now we can make it...

diff --git a/conf/modules.conf b/conf/modules.conf
index 1fd71f2ed6cf6fd213376700ce3abac7fdaa62e5..6310f432623ed414712d29b2cff7179c2c390b16 100644 (file)
--- 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 67f4958927c6055298fa229c2281e674480c49e6..6ffb46cdaa635ab3c213db26a1b19ad7b664e331 100644 (file)
--- 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 852fe1f04318568248d001d7bc8df2729e6abf7e..792c92569609e3a715890bb4631849c2111b2c94 100644 (file)
--- 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