summaryrefslogtreecommitdiff
path: root/bin/fail2ban-client
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2013-05-02 23:55:26 -0400
committerYaroslav Halchenko <debian@onerussian.com>2013-05-02 23:55:26 -0400
commitb65205d4add9e062c070aea54ef14baaa6749efa (patch)
tree91cbdfe18b94581ad43af65e0ddf6170e852af07 /bin/fail2ban-client
parent097fe63dcb32cf2e734f13e12b2aca45624cd739 (diff)
parent7c409dd24fbbef88e0d972e20d5f4223a06dce5d (diff)
downloadfail2ban-b65205d4add9e062c070aea54ef14baaa6749efa.tar.gz
Merge branch 'master' into 0.9
* master: ENH: "is None" instead of "== None" + tune ups in headers BF: log error only if there were missed config files that couldn't be read DOC: missing cinfo tags are ok. Log error for self referencing definitions DOC: s/defination/definition/g learn to spell Changelog entry for the previous commit and some untabify BF: pyinotify backend should also handle IN_MOVED_TO events ENH: remove stats of config files and use results of SafeConfigParserWithIncludes.read to facilitate meaningful error messages DOC: credits for gh-70 fix BF: ensure dates in email are in the C locale. Thanks iGeorgeX DOC: ChangeLog for recursive tag substition ENH: allow recursive tag substitution in action files. DOC: document <br> tag DOC: ChangeLog for named-refused entry ENH: Account for views in named filter. By Romain Riviere in gentoo bug #259458 DOC: release documentation and distributor contacts DOC: changelog entry for enhanced ssh filter BF: Rename mentioning of README to README.md (Fixes #187) updated README.md to hyperlink, add travis and coversall Moving README into a markup README.md for github's goodnesses Conflicts: DEVELOP README.md fail2ban/client/configreader.py fail2ban/server/datedetector.py
Diffstat (limited to 'bin/fail2ban-client')
-rwxr-xr-xbin/fail2ban-client4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/fail2ban-client b/bin/fail2ban-client
index e0b7efc6..26dadff8 100755
--- a/bin/fail2ban-client
+++ b/bin/fail2ban-client
@@ -342,9 +342,9 @@ class Fail2banClient:
# Set socket path
self.__configurator.readEarly()
conf = self.__configurator.getEarlyOptions()
- if self.__conf["socket"] == None:
+ if self.__conf["socket"] is None:
self.__conf["socket"] = conf["socket"]
- if self.__conf["pidfile"] == None:
+ if self.__conf["pidfile"] is None:
self.__conf["pidfile"] = conf["pidfile"]
logSys.info("Using socket file " + self.__conf["socket"])