From 8db3e1f74a7fa69dffc6e380f99c64dbc99cc8dd Mon Sep 17 00:00:00 2001 From: Cyril Jaquier Date: Tue, 12 Aug 2008 22:05:13 +0000 Subject: [PATCH] - Removed "timeregex" and "timepattern" stuff that is not needed anymore. git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@711 a942ae1a-1317-0410-a47c-b1dcaea8d605 --- client/filterreader.py | 10 ++-------- common/protocol.py | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/client/filterreader.py b/client/filterreader.py index 4bb36fda..4e546da2 100644 --- a/client/filterreader.py +++ b/client/filterreader.py @@ -53,20 +53,14 @@ class FilterReader(ConfigReader): return ConfigReader.read(self, "filter.d/" + self.__file) def getOptions(self, pOpts): - opts = [["string", "timeregex", None], - ["string", "timepattern", None], - ["string", "ignoreregex", ""], + opts = [["string", "ignoreregex", ""], ["string", "failregex", ""]] self.__opts = ConfigReader.getOptions(self, "Definition", opts, pOpts) def convert(self): stream = list() for opt in self.__opts: - if opt == "timeregex": - stream.append(["set", self.__name, "timeregex", self.__opts[opt]]) - elif opt == "timepattern": - stream.append(["set", self.__name, "timepattern", self.__opts[opt]]) - elif opt == "failregex": + if opt == "failregex": for regex in self.__opts[opt].split('\n'): # Do not send a command if the rule is empty. if regex != '': diff --git a/common/protocol.py b/common/protocol.py index fa9f8b54..d0fbae73 100644 --- a/common/protocol.py +++ b/common/protocol.py @@ -72,8 +72,6 @@ protocol = [ ['', "JAIL INFORMATION", ""], ["get logpath", "gets the list of the monitored files for "], ["get ignoreip", "gets the list of ignored IP addresses for "], -["get timeregex", "gets the regular expression used for the time detection for "], -["get timepattern", "gets the pattern used for the time detection for "], ["get failregex", "gets the list of regular expressions which matches the failures for "], ["get ignoreregex", "gets the list of regular expressions which matches patterns to ignore for "], ["get findtime", "gets the time for which the filter will look back for failures for "],