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:
80dd33b
)
And GenMailBool
author
Peter Palfrader
<peter@palfrader.org>
Mon, 2 Aug 2010 20:51:50 +0000
(20:51 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 2 Aug 2010 20:51:50 +0000
(20:51 +0000)
ud-generate
patch
|
blob
|
history
diff --git
a/ud-generate
b/ud-generate
index
f49b20a
..
7ee1d22
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-675,7
+675,7
@@
def GenMailDisable(File):
Done(File, F, None)
# Generate a list of uids that should have boolean affects applied
Done(File, F, None)
# Generate a list of uids that should have boolean affects applied
-def GenMailBool(File,
K
ey):
+def GenMailBool(File,
k
ey):
F = None
try:
F = open(File + ".tmp", "w")
F = None
try:
F = open(File + ".tmp", "w")
@@
-684,21
+684,13
@@
def GenMailBool(File, Key):
global PasswdAttrs
for x in PasswdAttrs:
global PasswdAttrs
for x in PasswdAttrs:
- Reason = None
-
- if x[1].has_key(Key) == 0:
- continue
-
- if GetAttr(x, Key) != "TRUE":
- continue
-
- try:
- Line = "%s"%(GetAttr(x, "uid"))
- Line = Sanitize(Line) + "\n"
- F.write(Line)
- except:
- pass
-
+ a = UDLdap.Account(x[0], x[1])
+ if not key in a: continue
+ if not a[key] == 'TRUE': continue
+ Line = "%s"%(a['uid'])
+ Line = Sanitize(Line) + "\n"
+ F.write(Line)
+
# Oops, something unspeakable happened.
except:
Die(File, F, None)
# Oops, something unspeakable happened.
except:
Die(File, F, None)