Use the common routine from userdir_ldap.py which asks for the

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

diff --git a/ud-generate b/ud-generate
index a55df5d..0ba6fa9 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -158,8 +158,10 @@ def GenSSHShadow(l,File):
       raise "No Users";
 
    for x in PasswdAttrs:
-     if x[1].has_key("uidNumber") == 0 or \
-        x[1].has_key("sshRSAAuthKey") == 0:
+      # If the account is locked, do not write it.
+      # This is a partial stop-gap. The ssh also needs to change this
+      # to ignore ~/.ssh/authorized* files.
+      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1):
          continue;
 
       if x[1].has_key("uidNumber") == 0 or \
@@ -574,6 +576,8 @@ while(1):
    GenPasswd(l,OutDir+"passwd",Split[1]);
    sys.stdout.flush();
    GenGroup(l,OutDir+"group");
+   if CurrentHost == "haydn.debian.org" or CurrentHost == "costa.debian.org":
+       continue;
    GenShadow(l,OutDir+"shadow");
        
    # Link in global things