projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-generate: Make sure we only add people in gid 800 to debian-private.
[mirror/userdir-ldap.git]
/
ud-generate
diff --git
a/ud-generate
b/ud-generate
index
795816c
..
8ccd4b6
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-469,8
+469,8
@@
def GenGroup(File):
return grouprevmap
def CheckForward():
return grouprevmap
def CheckForward():
- global
DebianUse
rs
- for x in
DebianUse
rs:
+ global
PasswdAtt
rs
+ for x in
PasswdAtt
rs:
if x[1].has_key("emailForward") == 0:
continue
if x[1].has_key("emailForward") == 0:
continue
@@
-496,10
+496,10
@@
def GenForward(File):
os.umask(OldMask)
# Fetch all the users
os.umask(OldMask)
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
# Write out the email address for each user
# Write out the email address for each user
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
if x[1].has_key("emailForward") == 0:
continue
if x[1].has_key("emailForward") == 0:
continue
@@
-521,10
+521,10
@@
def GenCDB(File, Key):
os.umask(OldMask)
# Fetch all the users
os.umask(OldMask)
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
# Write out the email address for each user
# Write out the email address for each user
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
if not Key in x[1]:
continue
Value = GetAttr(x, Key)
if not Key in x[1]:
continue
Value = GetAttr(x, Key)
@@
-546,10
+546,10
@@
def GenMarkers(File):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
# Write out the position for each user
# Write out the position for each user
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0:
continue
try:
if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0:
continue
try:
@@
-572,10
+572,10
@@
def GenPrivate(File):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global DebianUsers
+ global Debian
DD
Users
# Write out the position for each user
# Write out the position for each user
- for x in DebianUsers:
+ for x in Debian
DD
Users:
if x[1].has_key("privateSub") == 0:
continue
if x[1].has_key("privateSub") == 0:
continue
@@
-637,9
+637,9
@@
def GenMailDisable(File):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
Reason = None
if x[1].has_key("mailDisableMessage"):
Reason = None
if x[1].has_key("mailDisableMessage"):
@@
-667,9
+667,9
@@
def GenMailBool(File, Key):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
Reason = None
if x[1].has_key(Key) == 0:
Reason = None
if x[1].has_key(Key) == 0:
@@
-698,9
+698,9
@@
def GenMailList(File, Key):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
Reason = None
if x[1].has_key(Key) == 0:
Reason = None
if x[1].has_key(Key) == 0:
@@
-903,10
+903,10
@@
def GenBSMTP(File, HomePrefix):
F = open(File + ".tmp", "w")
# Fetch all the users
F = open(File + ".tmp", "w")
# Fetch all the users
- global
DebianUse
rs
+ global
PasswdAtt
rs
# Write out the zone file entry for each user
# Write out the zone file entry for each user
- for x in
DebianUse
rs:
+ for x in
PasswdAtt
rs:
if x[1].has_key("dnsZoneEntry") == 0:
continue
if x[1].has_key("dnsZoneEntry") == 0:
continue
@@
-1095,8
+1095,7
@@
GlobalDir = GenerateDir + "/"
GenDisabledAccounts(GlobalDir + "disabled-accounts")
PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs)
GenDisabledAccounts(GlobalDir + "disabled-accounts")
PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs)
-#DebianUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs)
-DebianUsers = PasswdAttrs
+DebianDDUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs)
CheckForward()
CheckForward()