X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=490376a580ed3b6cf2edb130e8a5f8175cf37ae2;hb=9c3400fed701494b24575a602d25a83ae1815b72;hp=06f861f46becd205a10056845c234a58de3dfc1c;hpb=8d2ecf180bc525c59b2ddd40d36daa833623e0b0;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 06f861f..490376a 100755
--- a/ud-generate
+++ b/ud-generate
@@ -459,19 +459,16 @@ def GenGroup(File):
      
       # Sort them into a list of groups having a set of users
       for x in PasswdAttrs:
-         uid = GetAttr(x, "uid")
-         if 'gidNumber' in x[1]:
-            GroupHasPrimaryMembers[ int(x[1]["gidNumber"][0]) ] = True
-         if x[1].has_key("uidNumber") == 0 or not IsInGroup(x):
-            continue
-         if x[1].has_key("supplementaryGid") == 0:
-            continue
-     
+         a = UDLdap.Account(x[0], x[1])
+         GroupHasPrimaryMembers[ a['gidNumber'] ] = True
+         if not IsInGroup(x): continue
+         if not 'supplementaryGid' in a: continue
+
          supgroups=[]
-         addGroups(supgroups, x[1]["supplementaryGid"], uid)
+         addGroups(supgroups, a['supplementaryGid'], a['uid'])
          for g in supgroups:
-            GroupMap[g].append(uid)
-     
+            GroupMap[g].append(a['uid'])
+
       # Output the group file.
       J = 0
       for x in GroupMap.keys():