Add 1000 to UIDs and GIDs if the ud-generate.conf contains '[UIDSHIFT]' as

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

diff --git a/ud-generate b/ud-generate
index b7ca633..54aa361 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -88,7 +88,7 @@ def Done(File,F,Fdb):
     os.rename(File + ".tdb.tmp",File+".tdb");
   
 # Generate the password list
-def GenPasswd(l,File,HomePrefix):
+def GenPasswd(l,File,HomePrefix,PwdMarker,UidShift):
   F = None;
   try:
    F = open(File + ".tdb.tmp","w");
@@ -107,7 +107,8 @@ def GenPasswd(l,File,HomePrefix):
       if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50:
          continue;
 
-      Line = "%s:x:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\
+      Line = "%s:%s:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\
+              PwdMarker,\
               GetAttr(x,"uidNumber"),GetAttr(x,"gidNumber"),\
               GetAttr(x,"gecos"),HomePrefix,GetAttr(x,"uid"),\
               GetAttr(x,"loginShell"));
@@ -115,7 +116,7 @@ def GenPasswd(l,File,HomePrefix):
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
       F.write(".%s %s" % (GetAttr(x,"uid"),Line));
-      F.write("=%s %s" % (GetAttr(x,"uidNumber"),Line));
+      F.write("=%s %s" % ((int(GetAttr(x,"uidNumber"))+UidShift),Line));
       I = I + 1;
 
   # Oops, something unspeakable happened.
@@ -147,11 +148,20 @@ def GenShadow(l,File):
          Pass = '*';
       else:
          Pass = Pass[7:];
+
+      # If the account is locked, mark it as such in shadow
+      # See Debian Bug #308229 for why we set it to 1 instead of 0
+      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) \
+          or GetAttr(x,"userPassword").startswith("!"):
+         ShadowExpire = '1'
+      else:
+         ShadowExpire = GetAttr(x,"shadowexpire")
+
       Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x,"uid"),\
               Pass,GetAttr(x,"shadowLastChange"),\
               GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\
               GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\
-              GetAttr(x,"shadowexpire"));
+              ShadowExpire);
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
       F.write(".%s %s" % (GetAttr(x,"uid"),Line));
@@ -180,7 +190,8 @@ def GenSSHShadow(l,File):
       # 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):
+      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) \
+             or GetAttr(x,"userPassword").startswith("!"):
          continue;
 
       if x[1].has_key("uidNumber") == 0 or \
@@ -198,7 +209,7 @@ def GenSSHShadow(l,File):
   Done(File,F,None);
 
 # Generate the group list
-def GenGroup(l,File):
+def GenGroup(l,File,UidShift):
   F = None;
   try:
    F = open(File + ".tdb.tmp","w");
@@ -231,7 +242,10 @@ def GenGroup(l,File):
    for x in GroupMap.keys():
       if GroupIDMap.has_key(x) == 0:
          continue;
-      Line = "%s:x:%u:" % (x,GroupIDMap[x]);
+      NewGid = int(GroupIDMap[x]);
+      if NewGid >= 500:
+         NewGid = NewGid + UidShift
+      Line = "%s:x:%u:" % (x,NewGid)
       Comma = '';
       for I in GroupMap[x]:
         Line = Line + ("%s%s" % (Comma,I));
@@ -239,7 +253,7 @@ def GenGroup(l,File):
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (J,Line));
       F.write(".%s %s" % (x,Line));
-      F.write("=%u %s" % (GroupIDMap[x],Line));
+      F.write("=%u %s" % (NewGid,Line));
       J = J + 1;
       
   # Oops, something unspeakable happened.
@@ -365,7 +379,7 @@ def GenPrivate(l,File):
 
       # If the account is locked, do not write it
       if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) \
-             or (string.find(GetAttr(x,"userPassword"),"*PK*")  != -1):
+             or GetAttr(x,"userPassword").startswith("!"):
          continue;
 
       # If the account has no PGP key, do not write it
@@ -389,6 +403,39 @@ def GenPrivate(l,File):
    raise;
   Done(File,F,None);
 
+# Generate a list of locked accounts
+def GenDisabledAccounts(l,File):
+  F = None;
+  try:
+   F = open(File + ".tmp","w");
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   I = 0;
+   for x in PasswdAttrs:
+      if x[1].has_key("uidNumber") == 0:
+         continue;
+        
+      Pass = GetAttr(x,"userPassword");
+      Line = ""
+      # *LK* is the reference value for a locked account
+      # password starting with ! is also a locked account
+      if string.find(Pass,"*LK*") != -1 or Pass.startswith("!"):
+        # Format is <login>:<reason>
+        Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
+
+      if Line != "":
+        F.write(Sanitize(Line) + "\n")
+
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
 # Generate the list of local addresses that refuse all mail
 def GenMailDisable(l,File):
   F = None;
@@ -405,7 +452,10 @@ def GenMailDisable(l,File):
       
       # If the account is locked, disable incoming mail
       if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1):
-         Reason = "user account locked"
+         if GetAttr(x,"uid") == "luther":
+           continue
+        else:
+            Reason = "user account locked"
       else:
          if x[1].has_key("mailDisableMessage"):
             Reason = GetAttr(x,"mailDisableMessage")
@@ -756,6 +806,7 @@ GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow");
 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");
 GenHosts(l,GlobalDir+"debianhosts");
 GenMailDisable(l,GlobalDir+"mail-disable");
@@ -802,11 +853,17 @@ while(1):
    DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
    DoLink(GlobalDir,OutDir,"debianhosts");
    DoLink(GlobalDir,OutDir,"ssh_known_hosts");
+   DoLink(GlobalDir,OutDir,"disabled-accounts")
 
    sys.stdout.flush();
-   GenPasswd(l,OutDir+"passwd",Split[1]);
+   UidShift = 0
+   if ExtraList.has_key("[UIDSHIFT]"): UidShift=1000
+   if ExtraList.has_key("[NOPASSWD]"):
+      GenPasswd(l,OutDir+"passwd",Split[1], "*", UidShift);
+   else:
+      GenPasswd(l,OutDir+"passwd",Split[1], "x", UidShift);
    sys.stdout.flush();
-   GenGroup(l,OutDir+"group");
+   GenGroup(l,OutDir+"group", UidShift);
    if ExtraList.has_key("[UNTRUSTED]"):
        continue;
    if not ExtraList.has_key("[NOPASSWD]"):