ud-generate: don't blow up when a host does not have IP-addresses

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index 334af5d..3b9a627 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -1015,6 +1015,9 @@ def GenHosts(File):
          if IsDebianHost.match(GetAttr(x, "hostname")) is None:
             continue
 
+         if not 'ipHostNumber' in x[1]:
+            continue
+
          addrs = x[1]["ipHostNumber"]
          for addr in addrs:
             if addr not in seen:
@@ -1046,6 +1049,8 @@ Attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\
 
 # Generate the SubGroupMap and GroupIDMap
 for x in Attrs:
+   if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled":
+      continue
    if x[1].has_key("gidNumber") == 0:
       continue
    GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0])