From 7c33b443acbb6802c9aadfee11f7a09224ee612c Mon Sep 17 00:00:00 2001
From: Cyril Jaquier <cyril.jaquier@fail2ban.org>
Date: Tue, 7 Aug 2007 22:11:34 +0000
Subject: [PATCH] - Removed textToDns() which is not required anymore. Thanks
 to Yaroslav Halchenko

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@605 a942ae1a-1317-0410-a47c-b1dcaea8d605
---
 CHANGELOG        |  2 ++
 server/filter.py | 19 +++----------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 59417a31..da66b0a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,8 @@ ver. 0.8.1 (2007/??/??) - stable
   David Nutter
 - Added webmin authentication filter. Thanks to Guillaume
   Delvit
+- Removed textToDns() which is not required anymore. Thanks
+  to Yaroslav Halchenko
 
 ver. 0.8.0 (2007/05/03) - stable
 ----------
diff --git a/server/filter.py b/server/filter.py
index b567445a..04a86d79 100644
--- a/server/filter.py
+++ b/server/filter.py
@@ -503,17 +503,6 @@ class DNSUtils:
 						% dns)
 			return list()
 	
-	@staticmethod
-	def textToDns(text):
-		""" Search for possible DNS in an arbitrary text.
-			Thanks to Tom Pike.
-		"""
-		match = DNSUtils.DNS_CRE.match(text)
-		if match:
-			return match
-		else:
-			return None
-	
 	@staticmethod
 	def searchIP(text):
 		""" Search if an IP address if directly available and return
@@ -549,11 +538,9 @@ class DNSUtils:
 				ipList.append(plainIPStr)
 		if not ipList:
 			# Try to get IP from possible DNS
-			dns = DNSUtils.textToDns(text)
-			if not dns == None:
-				ip = DNSUtils.dnsToIp(dns.group(0))
-				for e in ip:
-					ipList.append(e)
+			ip = DNSUtils.dnsToIp(text)
+			for e in ip:
+				ipList.append(e)
 		return ipList
 	
 	@staticmethod