From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Fri, 20 Apr 2012 16:27:55 +0000 (+0400)
Subject: Fix multimap to handle ipv6 addresses.
X-Git-Tag: 0.5.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f48a65e3e7cad14d019b3f8930593bf2e4b3636;p=thirdparty%2Frspamd.git

Fix multimap to handle ipv6 addresses.
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 548cc2ea69..fe213b8e69 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -89,8 +89,11 @@ function check_multimap(task)
 			local ip = task:get_from_ip()
 			if ip then
 				local _,_,o1,o2,o3,o4 = string.find(ip, '(%d+)%.(%d+)%.(%d+)%.(%d+)')
-				local rbl_str = o4 .. '.' .. o3 .. '.' .. o2 .. '.' .. o1 .. '.' .. rule['map']
-				task:resolve_dns_a(rbl_str, 'multimap_rbl_cb')
+				if r then
+					-- TODO: cannot handle ipv6 addresses
+					local rbl_str = o4 .. '.' .. o3 .. '.' .. o2 .. '.' .. o1 .. '.' .. rule['map']
+					task:resolve_dns_a(rbl_str, 'multimap_rbl_cb')
+				end
 			end
 		elseif rule['type'] == 'rcpt' then
 			-- First try to get rcpt field