From: Andrew Lewis <nerf@judo.za.org>
Date: Fri, 31 Jan 2014 08:48:49 +0000 (+0200)
Subject: Support HELO blacklist and fix options registration for RDNS blacklist
X-Git-Tag: 0.6.8~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84d34fdae1c6e09f6599c32ccae5fd30fc8271f;p=thirdparty%2Frspamd.git

Support HELO blacklist and fix options registration for RDNS blacklist

Conflicts:
	src/plugins/lua/rbl.lua
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index ac3074fbd4..b40278f551 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -125,6 +125,8 @@ if type(rspamd_config.get_api_version) ~= 'nil' then
 		rspamd_config:register_module_option('rbl', 'default_ipv6', 'string')
 		rspamd_config:register_module_option('rbl', 'default_received', 'string')
 		rspamd_config:register_module_option('rbl', 'default_from', 'string')
+		rspamd_config:register_module_option('rbl', 'default_rdns', 'string')
+		rspamd_config:register_module_option('rbl', 'default_helo', 'string')
 	end
 end
 
@@ -151,8 +153,11 @@ end
 if(opts['default_rdns'] == nil) then
         opts['default_rdns'] = false
 end
+if(opts['default_helo'] == nil) then
+        opts['default_helo'] = false
+end
 for key,rbl in pairs(opts['rbls']) do
-	local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns" }
+	local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns", "helo" }
 	for i=1,table.maxn(o) do
 		if(rbl[o[i]] == nil) then
 			rbl[o[i]] = opts['default_' .. o[i]]