From dc3fd2ccb1f2d5a272bc22b6496635a85a3660b7 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 7 Apr 2008 22:49:47 +0000
Subject: [PATCH] - Added "Day/Month/Year Hour:Minute:Second" date template.
 Thanks to Dennis Winter.

git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@685 a942ae1a-1317-0410-a47c-b1dcaea8d605
---
 ChangeLog              | 2 ++
 server/datedetector.py | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4157cf63..bf80dd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ From ver. 0.8.3 (2008/??/??) - stable
 - Fixed "fail2ban-client get <jail> logpath". Bug #1916986.
 - Changed some log levels.
 - Added gssftpd filter. Thanks to Kevin Zembower.
+- Added "Day/Month/Year Hour:Minute:Second" date template.
+  Thanks to Dennis Winter.
 
 ver. 0.8.2 (2008/03/06) - stable
 ----------
diff --git a/server/datedetector.py b/server/datedetector.py
index c47a67c4..85dcc4c0 100644
--- a/server/datedetector.py
+++ b/server/datedetector.py
@@ -67,6 +67,12 @@ class DateDetector:
 			template.setRegex("\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}")
 			template.setPattern("%Y/%m/%d %H:%M:%S")
 			self.__templates.append(template)
+			# simple date too (from x11vnc)
+			template = DateStrptime()
+			template.setName("Day/Month/Year Hour:Minute:Second")
+			template.setRegex("\d{2}/\d{2}/\d{4} \d{2}:\d{2}:\d{2}")
+			template.setPattern("%d/%m/%Y %H:%M:%S")
+			self.__templates.append(template)
 			# Apache format [31/Oct/2006:09:22:55 -0000]
 			template = DateStrptime()
 			template.setName("Day/Month/Year:Hour:Minute:Second")