diff options
| author | Steven Hiscocks <steven@hiscocks.me.uk> | 2014-02-13 20:14:40 +0000 |
|---|---|---|
| committer | Steven Hiscocks <steven@hiscocks.me.uk> | 2014-02-13 20:14:40 +0000 |
| commit | f68d85a6aca4e516c770b36c49a2833e8c37b09d (patch) | |
| tree | 171f61de703b03079b6ae866660fd25f44d21a84 /bin/fail2ban-client | |
| parent | 9bbf4ea258908d87de898262b1c900e097b6efbe (diff) | |
| parent | 9bfc77c32003f0156b64a3ab04766b07d55a8e79 (diff) | |
| download | fail2ban-f68d85a6aca4e516c770b36c49a2833e8c37b09d.tar.gz | |
Merge branch 'master' into 0.9
Conflicts:
ChangeLog
Spelling correction of 0.8.13 fixed in master
config/jail.conf
Added nagios and duplicate php-url removal in master
Just nagios added, duplicate not issue in 0.9
Diffstat (limited to 'bin/fail2ban-client')
| -rwxr-xr-x | bin/fail2ban-client | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/fail2ban-client b/bin/fail2ban-client index c8778849..15fad1b0 100755 --- a/bin/fail2ban-client +++ b/bin/fail2ban-client @@ -137,7 +137,7 @@ class Fail2banClient: def __processCmd(self, cmd, showRet = True): beautifier = Beautifier() - ret = True + streamRet = True for c in cmd: beautifier.setInputCmd(c) try: @@ -148,10 +148,10 @@ class Fail2banClient: if showRet: print beautifier.beautify(ret[1]) else: - ret = False logSys.error("NOK: " + `ret[1].args`) if showRet: print beautifier.beautifyError(ret[1]) + streamRet = False except socket.error: if showRet: logSys.error("Unable to contact server. Is it running?") @@ -160,7 +160,7 @@ class Fail2banClient: if showRet: logSys.error(e) return False - return ret + return streamRet ## # Process a command line. |