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

amend to c2d2e79b0d48bf66b04c3772c2419f30a4b1f9db: missing error variable in import block; 

additionally fixes forgotten skip for cymru server case, if --no-network specified);
Closes #1568
pull/1569/head
sebres 2016-10-05 12:18:55 +02:00
parent c2d2e79b0d
commit 973ac9a45c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/server/banmanager.py
View File

@ -142,7 +142,7 @@ class BanManager:
resolver.lifetime = timeout resolver.lifetime = timeout
resolver.timeout = timeout / 2 resolver.timeout = timeout / 2
self.dnsResolver = resolver self.dnsResolver = resolver
except ImportError: # pragma: no cover except ImportError as e: # pragma: no cover
logSys.error("dnspython package is required but could not be imported") logSys.error("dnspython package is required but could not be imported")
return_dict["error"] = repr(e) return_dict["error"] = repr(e)
return_dict["asn"].append("error") return_dict["asn"].append("error")

1
fail2ban/tests/servertestcase.py
View File

@ -559,6 +559,7 @@ class Transmitter(TransmitterBase):
) )
def testJailStatusCymru(self): def testJailStatusCymru(self):
unittest.F2B.SkipIfNoNetwork()
try: try:
import dns.exception import dns.exception
import dns.resolver import dns.resolver