We don't use the LDAP object in these functions, so I don't see why we're passing...

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index 1e8b392..909cfce 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -157,7 +157,7 @@ def Done(File, F, Fdb):
       os.rename(File + ".tdb.tmp", File + ".tdb")
 
 # Generate the password list
-def GenPasswd(l, File, HomePrefix, PwdMarker):
+def GenPasswd(File, HomePrefix, PwdMarker):
    F = None
    try:
       F = open(File + ".tdb.tmp", "w")
@@ -295,9 +295,8 @@ def GenShadowSudo(l, File, untrusted):
    Done(File, F, None)
 
 # Generate the shadow list
-def GenSSHShadow(l):
+def GenSSHShadow():
    # Fetch all the users
-   singlefile = None
    userfiles = []
 
    global PasswdAttrs
@@ -307,9 +306,6 @@ def GenSSHShadow(l):
 
    for x in PasswdAttrs:
 
-      if x in DisabledUsers:
-         continue
-
       if x[1].has_key("uidNumber") == 0 or \
          x[1].has_key("sshRSAAuthKey") == 0:
          continue
@@ -412,7 +408,7 @@ def addGroups(existingGroups, newGroups, uid):
          addGroups(existingGroups, SubGroupMap[group], uid)
 
 # Generate the group list
-def GenGroup(l, File):
+def GenGroup(File):
    grouprevmap = {}
    F = None
    try:
@@ -600,7 +596,7 @@ def GenPrivate(l, File):
    Done(File, F, None)
 
 # Generate a list of locked accounts
-def GenDisabledAccounts(l, File):
+def GenDisabledAccounts(File):
    F = None
    try:
       F = open(File + ".tmp", "w")
@@ -1058,7 +1054,7 @@ else:
 
 # Generate global things
 GlobalDir = GenerateDir + "/"
-GenMailDisable(l, GlobalDir + "mail-disable")
+GenDisabledAccounts(GlobalDir + "disabled-accounts")
 
 for x in PasswdAttrs:
    if IsRetired(x):
@@ -1068,14 +1064,10 @@ PasswdAttrs = filter(lambda x: not x in RetiredUsers, PasswdAttrs)
 
 CheckForward()
 
-SSHFiles = GenSSHShadow(l)
+GenMailDisable(l, GlobalDir + "mail-disable")
 GenAllForward(l, GlobalDir + "mail-forward.cdb")
-GenMarkers(l, GlobalDir + "markers")
 GenPrivate(l, GlobalDir + "debian-private")
-GenDisabledAccounts(l, GlobalDir + "disabled-accounts")
-GenSSHKnown(l, GlobalDir + "ssh_known_hosts")
 #GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys')
-GenHosts(l, GlobalDir + "debianhosts")
 GenMailBool(l, GlobalDir + "mail-greylist", "mailGreylisting")
 GenMailBool(l, GlobalDir + "mail-callout", "mailCallout")
 GenMailList(l, GlobalDir + "mail-rbl", "mailRBL")
@@ -1088,6 +1080,11 @@ GenForward(l, GlobalDir + "forward-alias")
 
 PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs)
 
+SSHFiles = GenSSHShadow()
+GenMarkers(l, GlobalDir + "markers")
+GenSSHKnown(l, GlobalDir + "ssh_known_hosts")
+GenHosts(l, GlobalDir + "debianhosts")
+
 while(1):
    Line = F.readline()
    if Line == "":
@@ -1127,11 +1124,11 @@ while(1):
 
    sys.stdout.flush()
    if ExtraList.has_key("[NOPASSWD]"):
-      userlist = GenPasswd(l, OutDir + "passwd", Split[1], "*")
+      userlist = GenPasswd(OutDir + "passwd", Split[1], "*")
    else:
-      userlist = GenPasswd(l, OutDir + "passwd", Split[1], "x")
+      userlist = GenPasswd(OutDir + "passwd", Split[1], "x")
    sys.stdout.flush()
-   grouprevmap = GenGroup(l, OutDir + "group")
+   grouprevmap = GenGroup(OutDir + "group")
    GenShadowSudo(l, OutDir + "sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]"))
 
    # Now we know who we're allowing on the machine, export