projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let private generation use Account class
[mirror/userdir-ldap.git]
/
ud-generate
diff --git
a/ud-generate
b/ud-generate
index
303f9f5
..
1a40f67
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-608,15
+608,13
@@
def GenPrivate(File):
# Write out the position for each user
for x in DebianDDUsers:
# 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
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
continue
-
try:
try:
- Line = "%s"%(
GetAttr(x, "privateSub")
)
+ Line = "%s"%(
a['privateSub']
)
Line = Sanitize(Line) + "\n"
F.write(Line)
except:
Line = Sanitize(Line) + "\n"
F.write(Line)
except: