X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=1a40f67720c772e225185baa2ddd60407ebeeadc;hb=81d4f79a7431c4061147f3ed1c1c17c2d38ed4eb;hp=303f9f564651867438b6da967c8f7a4776446510;hpb=6171f9991eb458001488b215a09d34231d5890d4;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 303f9f5..1a40f67 100755
--- a/ud-generate
+++ b/ud-generate
@@ -608,15 +608,13 @@ def GenPrivate(File):
      
       # Write out the position for each user
       for x in DebianDDUsers:
-         if x[1].has_key("privateSub") == 0:
+         a = UDLdap.Account(x[0], x[1])
+         if not a.is_active_user():
             continue
-     
-         # If the account has no PGP key, do not write it
-         if x[1].has_key("keyFingerPrint") == 0:
+         if not 'privateSub' in a:
             continue
-     
          try:
-            Line = "%s"%(GetAttr(x, "privateSub"))
+            Line = "%s"%(a['privateSub'])
             Line = Sanitize(Line) + "\n"
             F.write(Line)
          except: