From 6d129491f7db5f3ac2688be35e96ea913932a241 Mon Sep 17 00:00:00 2001
From: Cyril Jaquier <cyril.jaquier@fail2ban.org>
Date: Mon, 25 Jun 2007 21:43:25 +0000
Subject: [PATCH] - Expand <HOST> in ignoreregex. Thanks to Yaroslav Halchenko

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@589 a942ae1a-1317-0410-a47c-b1dcaea8d605
---
 server/failregex.py | 4 +---
 server/regex.py     | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/failregex.py b/server/failregex.py
index 275380b9..9889ca67 100644
--- a/server/failregex.py
+++ b/server/failregex.py
@@ -40,9 +40,7 @@ class FailRegex(Regex):
 	# avoid construction of invalid object.
 	# @param value the regular expression
 	
-	def __init__(self, value):
-		# Replace "<HOST>" with default regular expression for host.
-		regex = value.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>\S+)")
+	def __init__(self, regex):
 		# Initializes the parent.
 		Regex.__init__(self, regex)
 		# Check for group "host"
diff --git a/server/regex.py b/server/regex.py
index d3d6eee4..22fb6797 100644
--- a/server/regex.py
+++ b/server/regex.py
@@ -42,6 +42,9 @@ class Regex:
 	
 	def __init__(self, regex):
 		self._matchCache = None
+		# Perform shortcuts expansions.
+		# Replace "<HOST>" with default regular expression for host.
+		regex = regex.replace("<HOST>", "(?:::f{4,6}:)?(?P<host>\S+)")
 		if regex.lstrip() == '':
 			raise RegexException("Cannot add empty regex")
 		try: