projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
059c1ab
)
Let disable-main-msg generation use Account class
author
Peter Palfrader
<peter@palfrader.org>
Mon, 2 Aug 2010 20:37:31 +0000
(20:37 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 2 Aug 2010 20:47:57 +0000
(20:47 +0000)
ud-generate
patch
|
blob
|
history
diff --git
a/ud-generate
b/ud-generate
index
c448701
..
f49b20a
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-661,19
+661,12
@@
def GenMailDisable(File):
global PasswdAttrs
for x in PasswdAttrs:
global PasswdAttrs
for x in PasswdAttrs:
- Reason = None
-
- if x[1].has_key("mailDisableMessage"):
- Reason = GetAttr(x, "mailDisableMessage")
- else:
+ a = UDLdap.Account(x[0], x[1])
+ if not 'mailDisableMessage' in a:
continue
continue
-
- try:
- Line = "%s: %s"%(GetAttr(x, "uid"), Reason)
- Line = Sanitize(Line) + "\n"
- F.write(Line)
- except:
- pass
+ Line = "%s: %s"%(a['uid'], a['mailDisableMessage'])
+ Line = Sanitize(Line) + "\n"
+ F.write(Line)
# Oops, something unspeakable happened.
except:
# Oops, something unspeakable happened.
except: