diff --git a/copyparty/ftpd.py b/copyparty/ftpd.py index b7246291..197ca59d 100644 --- a/copyparty/ftpd.py +++ b/copyparty/ftpd.py @@ -68,13 +68,13 @@ class FtpAuth(DummyAuthorizer): if ip.startswith("::ffff:"): ip = ip[7:] - ip = ipnorm(ip) + ipn = ipnorm(ip) bans = self.hub.bans - if ip in bans: - rt = bans[ip] - time.time() + if ipn in bans: + rt = bans[ipn] - time.time() if rt < 0: logging.info("client unbanned") - del bans[ip] + del bans[ipn] else: raise AuthenticationFailed("banned") diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 39ac5093..199ccce9 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -433,7 +433,7 @@ class SvcHub(object): # create netmaps early to avoid firewall gaps, # but the mutex blocks multiprocessing startup - for zs in "ipu_iu ftp_ipa_nm tftp_ipa_nm".split(): + for zs in "ipu_nm ftp_ipa_nm tftp_ipa_nm".split(): try: getattr(args, zs).mutex = threading.Lock() except: