]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
unbound-dhcp-leases-bridge: Migrate to Python 3
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 May 2021 11:53:11 +0000 (12:53 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 May 2021 11:54:21 +0000 (11:54 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/unbound/unbound-dhcp-leases-bridge

index e3da4860bd1718b835d7a53d9be6b89222f36fef..2d8ef1387706a2d9380dce8379c92a3c46400c29 100644 (file)
@@ -178,8 +178,8 @@ class UnboundDHCPLeasesBridge(object):
 
                # Dump everything in the logs
                log.debug("Static hosts:")
-               for hostname, addresses in hosts.items():
-                       log.debug("  %-20s : %s" % (hostname, ", ".join(addresses)))
+               for name in hosts:
+                       log.debug("  %-20s : %s" % (name, ", ".join(hosts[name])))
 
                return hosts
 
@@ -402,9 +402,9 @@ class Lease(object):
 
                address = ipaddress.ip_address(self.ipaddr)
 
-               for subnet, domain in subnets.items():
+               for subnet in subnets:
                        if address in subnet:
-                               return domain
+                               return subnets[subnet]
 
                # Fall back to localdomain if no match could be found
                return "localdomain"