From 24ce3dfcb264f348d585efbca8b463eb641d297c Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 9 Aug 2009 22:23:54 +0000 Subject: [PATCH] stop doing DNS lookups, part 1 Signed-off-by: Stephen Gran --- ud-generate | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/ud-generate b/ud-generate index 2319787..4800938 100755 --- a/ud-generate +++ b/ud-generate @@ -1003,33 +1003,22 @@ def GenHosts(l, File): F = open(File + ".tmp", "w", 0644) os.umask(OldMask) - # Fetch all the hosts - hostnames = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "hostname=*", - ["hostname"]) - - if hostnames is None: - raise UDEmptyList, "No Hosts" - seen = set() - for x in hostnames: - host = GetAttr(x, "hostname", None) - if host: - addrs = [] - try: - addrs += socket.getaddrinfo(host, None, socket.AF_INET) - except socket.error: - pass - try: - addrs += socket.getaddrinfo(host, None, socket.AF_INET6) - except socket.error: - pass - - for addrinfo in addrs: - if addrinfo[0] in (socket.AF_INET, socket.AF_INET6): - addr = addrinfo[4][0] - if addr not in seen: - print >> F, addrinfo[4][0] - seen.add(addr) + + global HostAttrs + + for x in HostAttrs: + + if IsDebianHost.match(GetAttr(x, "hostname")) is None: + continue + + addrs = x[0]["ipHostNumber"] + for addr in addrs: + if addr not in seen: + seen.add(addr) + addr = Sanitize(addr) + "\n" + F.write(addr) + # Oops, something unspeakable happened. except: Die(File, F, None) -- 2.20.1