From 9ad2a7d1e58101e4dea0695a6d56bce7a1f4bce3 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 17 Feb 2015 12:47:17 +0200
Subject: Support emails dnsbl

---
 conf/modules.conf | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'conf/modules.conf')

diff --git a/conf/modules.conf b/conf/modules.conf
index 1a4185c97..1fd71f2ed 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -201,6 +201,16 @@ rbl {
         }
     }
 
+    rambleremails {
+        symbol = RAMBLER_EMAILBL;
+        rbl = email-bl.rambler.ru;
+        from = false;
+        emails = true;
+        exclude_users = false;
+        exclude_private_ips = false;
+        exclude_local = false;
+    }
+
  }
 }
 
@@ -222,13 +232,8 @@ once_received {
 phishing {
     symbol = "PHISHING";
 }
-emails {
-    rule { 
-        symbol = RAMBLER_EMAILBL;
-        dnsbl = email-bl.rambler.ru;
-        domain_only = false;
-    }
-}
+#emails {
+#}
 spf {
     spf_cache_size = 2k;
     spf_cache_expire = 1d;
-- 
cgit v1.2.3


From 9e1b3fd96d6313535e02cb9ece8a90c0cb0062b2 Mon Sep 17 00:00:00 2001
From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 17 Feb 2015 13:12:05 +0200
Subject: Since exclude_private_ips requires config to change behaviour now we
 can make it default true

---
 conf/modules.conf           | 1 -
 doc/markdown/modules/rbl.md | 2 +-
 src/plugins/lua/rbl.lua     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'conf/modules.conf')

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
-- 
cgit v1.2.3