From a3e216b0b24789f4be6368ccff883f08484b958d Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Sat, 27 Apr 2013 20:56:31 +0100 Subject: [PATCH] BF: Change name->actname for multi action jails to avoid clash Primary examples is `name` is used in iptables actions for the chain. Also changed pop->get so actname can be used as keyword --- fail2ban/client/actionreader.py | 2 +- fail2ban/tests/clientreadertestcase.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fail2ban/client/actionreader.py b/fail2ban/client/actionreader.py index d2d71a74..7ae3c45b 100644 --- a/fail2ban/client/actionreader.py +++ b/fail2ban/client/actionreader.py @@ -44,7 +44,7 @@ class ActionReader(DefinitionInitConfigReader): ] def __init__(self, file_, jailName, initOpts, **kwargs): - self._name = initOpts.pop("name", file_) + self._name = initOpts.get("actname", file_) DefinitionInitConfigReader.__init__( self, file_, jailName, initOpts, **kwargs) diff --git a/fail2ban/tests/clientreadertestcase.py b/fail2ban/tests/clientreadertestcase.py index 012fc2bf..61101aa5 100644 --- a/fail2ban/tests/clientreadertestcase.py +++ b/fail2ban/tests/clientreadertestcase.py @@ -312,8 +312,8 @@ class JailsReaderTest(unittest.TestCase): jailfd = open(os.path.join(basedir, "jail.conf"), 'w') jailfd.write(""" [testjail1] -action = testaction1[name=test1] - testaction1[name=test2] +action = testaction1[actname=test1] + testaction1[actname=test2] filter = testfilter1 """) jailfd.close()