github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

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
pull/189/head
Steven Hiscocks 2013-04-27 20:56:31 +01:00
parent bec70cbe4b
commit a3e216b0b2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/client/actionreader.py
View File

@ -44,7 +44,7 @@ class ActionReader(DefinitionInitConfigReader):
] ]
def __init__(self, file_, jailName, initOpts, **kwargs): def __init__(self, file_, jailName, initOpts, **kwargs):
self._name = initOpts.pop("name", file_) self._name = initOpts.get("actname", file_)
DefinitionInitConfigReader.__init__( DefinitionInitConfigReader.__init__(
self, file_, jailName, initOpts, **kwargs) self, file_, jailName, initOpts, **kwargs)

4
fail2ban/tests/clientreadertestcase.py
View File

@ -312,8 +312,8 @@ class JailsReaderTest(unittest.TestCase):
jailfd = open(os.path.join(basedir, "jail.conf"), 'w') jailfd = open(os.path.join(basedir, "jail.conf"), 'w')
jailfd.write(""" jailfd.write("""
[testjail1] [testjail1]
action = testaction1[name=test1] action = testaction1[actname=test1]
testaction1[name=test2] testaction1[actname=test2]
filter = testfilter1 filter = testfilter1
""") """)
jailfd.close() jailfd.close()