subgroup support, courtesy of luk
[mirror/userdir-ldap.git] / ud-generate
index 773b746..5f2a482 100755 (executable)
@@ -9,6 +9,7 @@
 #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Andreas Barth <aba@not.so.argh.org>
 #   Copyright (c) 2008 Mark Hymers <mhy@debian.org>
+#   Copyright (c) 2008 Luk Claes <luk@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -32,14 +33,16 @@ global CurrentHost;
 
 PasswdAttrs = None;
 GroupIDMap = {};
+SubGroupMap = {};
 Allowed = None;
 CurrentHost = "";
 
+UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
 BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
-Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
-             "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
+Keyrings = ConfModule.sync_keyrings.split(":")
 
 def safe_makedirs(dir):
     try:
@@ -88,7 +91,11 @@ def IsInGroup(DnRecord):
 
   # Check the supplementary groups
   for I in DnRecord[1]["supplementaryGid"]:
-     if Allowed.has_key(I):
+     s = I.split('@', 1)
+     group = s[0]
+     if len(s) == 2 and s[1] != CurrentHost:
+           continue;
+     if Allowed.has_key(group):
         return 1;
   return 0;
 
@@ -109,7 +116,7 @@ def Done(File,F,Fdb):
   if Fdb != None:
     Fdb.close();
     os.rename(File + ".tdb.tmp",File+".tdb");
-  
+
 # Generate the password list
 def GenPasswd(l,File,HomePrefix,PwdMarker):
   F = None;
@@ -170,7 +177,7 @@ def GenShadow(l,File):
    for x in PasswdAttrs:
       if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
          continue;
-        
+
       Pass = GetAttr(x,"userPassword");
       if Pass[0:7] != "{crypt}" or len(Pass) > 50:
          Pass = '*';
@@ -183,12 +190,12 @@ def GenShadow(l,File):
           or GetAttr(x,"userPassword").startswith("!"):
          ShadowExpire = '1'
       else:
-         ShadowExpire = GetAttr(x,"shadowexpire")
+         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,"shadowWarning"),GetAttr(x,"shadowInactive"),\
               ShadowExpire);
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
@@ -201,32 +208,72 @@ def GenShadow(l,File):
    raise;
   Done(File,None,F);
 
+# Generate the sudo passwd file
+def GenShadowSudo(l,File, untrusted):
+  F = None;
+  try:
+   OldMask = os.umask(0077);
+   F = open(File + ".tmp","w",0600);
+   os.umask(OldMask);
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   for x in PasswdAttrs:
+      Pass = '*'
+      if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
+         continue;
+
+      if x[1].has_key('sudoPassword'):
+         for entry in x[1]['sudoPassword']:
+            Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
+            if Match == None:
+               continue
+            uuid = Match.group(1)
+            status = Match.group(2)
+            hosts = Match.group(3)
+            cryptedpass = Match.group(4)
+
+            if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass):
+               continue
+            for_all = hosts == "*"
+            for_this_host = CurrentHost in hosts.split(',')
+            if not (for_all or for_this_host):
+               continue
+            # ignore * passwords for untrusted hosts, but copy host specific passwords
+            if for_all and untrusted:
+               continue
+            Pass = cryptedpass
+            if for_this_host: # this makes sure we take a per-host entry over the for-all entry
+              break
+         if len(Pass) > 50:
+            Pass = '*'
+
+      Line = "%s:%s" % (GetAttr(x,"uid"), Pass)
+      Line = Sanitize(Line) + "\n";
+      F.write("%s" % (Line));
+
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
 # Generate the shadow list
-def GenSSHShadow(l,masterFileName):
+def GenSSHShadow(l):
    # Fetch all the users
    singlefile = None
    userfiles = []
-   # Depending on config, we write out either a single file,
-   # multiple files, or both
-   if SingleSSHFile:
-       try:
-           OldMask = os.umask(0077);
-           masterFile = open(masterFileName + ".tmp","w",0600);
-           os.umask(OldMask);
-       except IOError:
-           Die(masterFileName,masterFile,None)
-           raise
 
    global PasswdAttrs;
    if PasswdAttrs == None:
       raise "No Users";
 
-   # If we're going to be dealing with multiple keys, empty the
-   # directory before we start to avoid old keys hanging around
-   if MultipleSSHFiles:
-      safe_rmtree(os.path.join(GlobalDir, 'userkeys'))
-      safe_makedirs(os.path.join(GlobalDir, 'userkeys'))
-      
+   safe_rmtree(os.path.join(GlobalDir, 'userkeys'))
+   safe_makedirs(os.path.join(GlobalDir, 'userkeys'))
+
    for x in PasswdAttrs:
       # If the account is locked, do not write it.
       # This is a partial stop-gap. The ssh also needs to change this
@@ -242,25 +289,18 @@ def GenSSHShadow(l,masterFileName):
       F = None;
 
       try:
-         if MultipleSSHFiles:
-             OldMask = os.umask(0077);
-             File = os.path.join(GlobalDir, 'userkeys', User)
-             F = open(File + ".tmp","w",0600);
-             os.umask(OldMask);
+         OldMask = os.umask(0077);
+         File = os.path.join(GlobalDir, 'userkeys', User)
+         F = open(File + ".tmp","w",0600);
+         os.umask(OldMask);
 
          for I in x[1]["sshRSAAuthKey"]:
-             if MultipleSSHFiles:
-                 MultipleLine = "%s" % I
-                 MultipleLine = Sanitize(MultipleLine) + "\n"
-                 F.write(MultipleLine)
-             if SingleSSHFile:
-                 SingleLine = "%s: %s" % (User, I)
-                 SingleLine = Sanitize(SingleLine) + "\n"
-                 masterFile.write(SingleLine)
-
-         if MultipleSSHFiles:
-             Done(File,F,None);
-             userfiles.append(os.path.basename(File))
+            MultipleLine = "%s" % I
+            MultipleLine = Sanitize(MultipleLine) + "\n"
+            F.write(MultipleLine)
+
+         Done(File,F,None);
+         userfiles.append(os.path.basename(File))
 
       # Oops, something unspeakable happened.
       except IOError:
@@ -268,11 +308,79 @@ def GenSSHShadow(l,masterFileName):
           Die(masterFileName,masterFile,None)
           raise;
 
-   if SingleSSHFile:
-       Done(masterFileName,masterFile,None)
-       singlefile = os.path.basename(masterFileName)
+   return userfiles
+
+def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target):
+   OldMask = os.umask(0077);
+   tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz')
+   os.umask(OldMask);
+   for f in userlist.keys():
+      if f not in SSHFiles:
+         continue
+      # If we're not exporting their primary group, don't export
+      # the key and warn
+      grname = None
+      if userlist[f] in grouprevmap.keys():
+         grname = grouprevmap[userlist[f]]
+      else:
+         try:
+            if int(userlist[f]) <= 100:
+               # In these cases, look it up in the normal way so we
+               # deal with cases where, for instance, users are in group
+               # users as their primary group.
+               grname = grp.getgrgid(userlist[f])[0]
+         except Exception, e:
+            pass
+
+      if grname is None:
+         print "User %s is supposed to have their key exported to host %s but their primary group (gid: %d) isn't in LDAP" % (f, CurrentHost, userlist[f])
+         continue
+
+      to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f)
+      # These will only be used where the username doesn't
+      # exist on the target system for some reason; hence,
+      # in those cases, the safest thing is for the file to
+      # be owned by root but group nobody.  This deals with
+      # the bloody obscure case where the group fails to exist
+      # whilst the user does (in which case we want to avoid
+      # ending up with a file which is owned user:root to avoid
+      # a fairly obvious attack vector)
+      to.uid = 0
+      to.gid = 65534
+      # Using the username / groupname fields avoids any need
+      # to give a shit^W^W^Wcare about the UIDoffset stuff.
+      to.uname = f
+      to.gname = grname
+      to.mode  = 0400
+      tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f)))
+
+   tf.close()
+   os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), target)
+
+# add a list of groups to existing groups,
+# including all subgroups thereof, recursively.
+# basically this proceduces the transitive hull of the groups in
+# addgroups.
+def addGroups(existingGroups, newGroups, uid):
+   for group in newGroups:
+      # if it's a <group>@host, split it and verify it's on the current host.
+      s = group.split('@', 1)
+      if len(s) == 2 and s[1] != CurrentHost:
+         continue;
+      group = s[0]
+
+      # let's see if we handled this group already
+      if group in existingGroups:
+        continue
+
+      if not GroupIDMap.has_key(group):
+         print "Group does not exist ",group,"but",uid,"is in it"
+         continue
+
+      existingGroups.append(group)
 
-   return singlefile, userfiles
+      if SubGroupMap.has_key(group):
+         addGroups(existingGroups, SubGroupMap[group])
 
 # Generate the group list
 def GenGroup(l,File):
@@ -285,7 +393,7 @@ def GenGroup(l,File):
    GroupMap = {};
    for x in GroupIDMap.keys():
       GroupMap[x] = [];
-      
+
    # Fetch all the users
    global PasswdAttrs;
    if PasswdAttrs == None:
@@ -293,17 +401,17 @@ def GenGroup(l,File):
 
    # Sort them into a list of groups having a set of users
    for x in PasswdAttrs:
+      uid = GetAttr(x,"uid")
       if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
          continue;
       if x[1].has_key("supplementaryGid") == 0:
          continue;
-        
-      for I in x[1]["supplementaryGid"]:
-         if GroupMap.has_key(I):
-           GroupMap[I].append(GetAttr(x,"uid"));
-        else:
-            print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it";
-           
+
+      supgroups=[]
+      addGroups(supgroups, x[1]["supplementaryGid"], uid)
+      for g in supgroups:
+         GroupMap[g].append(uid);
+
    # Output the group file.
    J = 0;
    for x in GroupMap.keys():
@@ -320,7 +428,7 @@ def GenGroup(l,File):
       F.write(".%s %s" % (x,Line));
       F.write("=%u %s" % (GroupIDMap[x],Line));
       J = J + 1;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,None,F);
@@ -346,7 +454,7 @@ def GenForward(l,File):
    for x in PasswdAttrs:
       if x[1].has_key("emailForward") == 0 or IsInGroup(x) == 0:
          continue;
-      
+
       # Do not allow people to try to buffer overflow busted parsers
       if len(GetAttr(x,"emailForward")) > 200:
          continue;
@@ -357,7 +465,7 @@ def GenForward(l,File):
       Line = "%s: %s" % (GetAttr(x,"uid"),GetAttr(x,"emailForward"));
       Line = Sanitize(Line) + "\n";
       F.write(Line);
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -380,7 +488,7 @@ def GenAllForward(l,File):
    for x in PasswdAttrs:
       if x[1].has_key("emailForward") == 0:
          continue;
-      
+
       # Do not allow people to try to buffer overflow busted parsers
       Forward = GetAttr(x,"emailForward");
       if len(Forward) > 200:
@@ -389,7 +497,7 @@ def GenAllForward(l,File):
       # Check the forwarding address
       if EmailCheck.match(Forward) == None:
          continue;
-        
+
       User = GetAttr(x,"uid");
       Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(Forward),User,Forward));
    Fdb.write("\n");
@@ -400,7 +508,7 @@ def GenAllForward(l,File):
   if Fdb.close() != None:
     raise "cdbmake gave an error";
 
-# Generate the anon XEarth marker file 
+# Generate the anon XEarth marker file
 def GenMarkers(l,File):
   F = None;
   try:
@@ -414,14 +522,14 @@ def GenMarkers(l,File):
    # Write out the position for each user
    for x in PasswdAttrs:
       if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0:
-         continue;      
+         continue;
       try:
          Line = "%8s %8s \"\""%(DecDegree(GetAttr(x,"latitude"),1),DecDegree(GetAttr(x,"longitude"),1));
          Line = Sanitize(Line) + "\n";
          F.write(Line);
       except:
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -455,7 +563,7 @@ def GenPrivate(l,File):
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":
-        continue;
+         continue;
 
       try:
          Line = "%s"%(GetAttr(x,"privateSub"));
@@ -463,7 +571,7 @@ def GenPrivate(l,File):
          F.write(Line);
       except:
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -485,17 +593,17 @@ def GenDisabledAccounts(l,File):
    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 Pass.find("*LK*") != -1 or Pass.startswith("!"):
-        # Format is <login>:<reason>
-        Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
+         # Format is <login>:<reason>
+         Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
 
       if Line != "":
-        F.write(Sanitize(Line) + "\n")
+         F.write(Sanitize(Line) + "\n")
 
   # Oops, something unspeakable happened.
   except:
@@ -524,7 +632,7 @@ def GenMailDisable(l,File):
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":
-        continue;
+         continue;
 
       try:
          Line = "%s: %s"%(GetAttr(x,"uid"),Reason);
@@ -532,7 +640,7 @@ def GenMailDisable(l,File):
          F.write(Line);
       except:
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -552,13 +660,13 @@ def GenMailBool(l,File,Key):
 
    for x in PasswdAttrs:
       Reason = None
-      
+
       if x[1].has_key(Key) == 0:
          continue
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":
-        continue
+         continue
 
       if GetAttr(x,Key) != "TRUE":
          continue
@@ -569,7 +677,7 @@ def GenMailBool(l,File,Key):
          F.write(Line);
       except:
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -589,24 +697,24 @@ def GenMailList(l,File,Key):
 
    for x in PasswdAttrs:
       Reason = None
-      
+
       if x[1].has_key(Key) == 0:
          continue
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":
-        continue
+         continue
 
       try:
          found = 0
          Line = None
          for z in x[1][Key]:
              if Key == "mailWhitelist":
-                if re.match('^[-\w.]+(/[\d]+)?$',z) == None:
-                    continue
-            else:
-                if re.match('^[-\w.]+$',z) == None:
-                    continue
+                 if re.match('^[-\w.]+(/[\d]+)?$',z) == None:
+                     continue
+             else:
+                 if re.match('^[-\w.]+$',z) == None:
+                     continue
              if found == 0:
                  found = 1
                  Line = GetAttr(x,"uid")
@@ -621,7 +729,7 @@ def GenMailList(l,File,Key):
              F.write(Line);
       except:
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -633,7 +741,7 @@ def GenDNS(l,File,HomePrefix):
   F = None;
   try:
    F = open(File + ".tmp","w");
-   
+
    # Fetch all the users
    global PasswdAttrs;
    if PasswdAttrs == None:
@@ -651,32 +759,32 @@ def GenDNS(l,File,HomePrefix):
          F.write("; %s\n"%(EmailAddress(x)));
          for z in x[1]["dnsZoneEntry"]:
             Split = z.lower().split()
-           if Split[1].lower() == 'in':
+            if Split[1].lower() == 'in':
                for y in range(0,len(Split)):
                   if Split[y] == "$":
                      Split[y] = "\n\t";
                Line = " ".join(Split) + "\n";
                F.write(Line);
-              
-              Host = Split[0] + DNSZone;
-              if BSMTPCheck.match(Line) != None:
-                  F.write("; Has BSMTP\n");
-                              
-              # Write some identification information
+
+               Host = Split[0] + DNSZone;
+               if BSMTPCheck.match(Line) != None:
+                   F.write("; Has BSMTP\n");
+
+               # Write some identification information
                if Split[2].lower() == "a":
-                 Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
+                  Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
                   for y in x[1]["keyFingerPrint"]:
-                    Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));
+                     Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));
                   F.write(Line);
-           else:
+            else:
                Line = "; Err %s"%(str(Split));
                F.write(Line);
 
          F.write("\n");
       except:
-        F.write("; Errors\n");
+         F.write("; Errors\n");
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -688,7 +796,7 @@ def GenSSHFP(l,File,HomePrefix):
   F = None
   try:
    F = open(File + ".tmp","w")
-   
+
    # Fetch all the hosts
    global HostAttrs
    if HostAttrs == None:
@@ -723,7 +831,7 @@ def GenBSMTP(l,File,HomePrefix):
   F = None;
   try:
    F = open(File + ".tmp","w");
-   
+
    # Fetch all the users
    global PasswdAttrs;
    if PasswdAttrs == None:
@@ -740,21 +848,21 @@ def GenBSMTP(l,File,HomePrefix):
       try:
          for z in x[1]["dnsZoneEntry"]:
             Split = z.lower().split()
-           if Split[1].lower() == 'in':
+            if Split[1].lower() == 'in':
                for y in range(0,len(Split)):
                   if Split[y] == "$":
                      Split[y] = "\n\t";
                Line = " ".join(Split) + "\n";
-              
-              Host = Split[0] + DNSZone;
-              if BSMTPCheck.match(Line) != None:
-                  F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host,
-                              GetAttr(x,"uid"),HomePrefix,GetAttr(x,"uid"),Host));
-                              
+
+               Host = Split[0] + DNSZone;
+               if BSMTPCheck.match(Line) != None:
+                   F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host,
+                               GetAttr(x,"uid"),HomePrefix,GetAttr(x,"uid"),Host));
+
       except:
-        F.write("; Errors\n");
+         F.write("; Errors\n");
          pass;
-      
+
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -790,7 +898,7 @@ def GenSSHKnown(l,File,mode=None):
    global HostAttrs
    if HostAttrs == None:
       raise "No Hosts";
-   
+
    for x in HostAttrs:
       if x[1].has_key("hostname") == 0 or \
          x[1].has_key("sshRSAHostKey") == 0:
@@ -825,7 +933,7 @@ def GenHosts(l,File):
    # Fetch all the hosts
    HostNames = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"hostname=*",\
                 ["hostname"]);
-   
+
    if HostNames == None:
       raise "No Hosts";
 
@@ -848,8 +956,9 @@ def GenKeyrings(l,OutDir):
   for k in Keyrings:
     shutil.copy(k, OutDir)
 
+
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
+l = connectLDAP()
 F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
 Pass = F.readline().strip().split(" ")
 F.close();
@@ -858,24 +967,26 @@ l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]);
 # Fetch all the groups
 GroupIDMap = {};
 Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"gid=*",\
-                  ["gid","gidNumber"]);
+                  ["gid","gidNumber","subGroup"]);
 
-# Generate the GroupMap and GroupIDMap
+# Generate the SubGroupMap and GroupIDMap
 for x in Attrs:
    if x[1].has_key("gidNumber") == 0:
       continue;
    GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]);
+   if x[1].has_key("subGroup") != 0:
+      SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]);
 
 # Fetch all the users
 PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                 ["uid","uidNumber","gidNumber","supplementaryGid",\
                  "gecos","loginShell","userPassword","shadowLastChange",\
-                 "shadowMin","shadowMax","shadowWarning","shadowinactive",
-                "shadowexpire","emailForward","latitude","longitude",\
+                 "shadowMin","shadowMax","shadowWarning","shadowInactive",
+                 "shadowExpire","emailForward","latitude","longitude",\
                  "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
-                "keyFingerPrint","privateSub","mailDisableMessage",\
+                 "keyFingerPrint","privateSub","mailDisableMessage",\
                  "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\
-                 "mailWhitelist"]);
+                 "mailWhitelist", "sudoPassword"]);
 # Fetch all the hosts
 HostAttrs    = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
                 ["hostname","sshRSAHostKey"]);
@@ -888,7 +999,7 @@ else:
 
 # Generate global things
 GlobalDir = GenerateDir+"/";
-SSHGlobal, SSHFiles = GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow");
+SSHFiles = GenSSHShadow(l);
 GenAllForward(l,GlobalDir+"mail-forward.cdb");
 GenMarkers(l,GlobalDir+"markers");
 GenPrivate(l,GlobalDir+"debian-private");
@@ -938,10 +1049,6 @@ while(1):
      Allowed = None
    CurrentHost = Split[0];
 
-   # If we're using a single SSH file, deal with it
-   if SSHGlobal is not None:
-      DoLink(GlobalDir, OutDir, SSHGlobal)
-
    DoLink(GlobalDir,OutDir,"debianhosts");
    DoLink(GlobalDir,OutDir,"ssh_known_hosts");
    DoLink(GlobalDir,OutDir,"disabled-accounts")
@@ -953,64 +1060,21 @@ while(1):
       userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x");
    sys.stdout.flush();
    grouprevmap = GenGroup(l,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
    # the relevant ssh keys
-   if MultipleSSHFiles:
-      OldMask = os.umask(0077);
-      tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz')
-      os.umask(OldMask);
-      for f in userlist.keys():
-        if f not in SSHFiles:
-            continue
-        # If we're not exporting their primary group, don't export 
-        # the key and warn
-        grname = None
-        if userlist[f] in grouprevmap.keys():
-            grname = grouprevmap[userlist[f]]
-        else:
-            try:
-                if int(userlist[f]) <= 100:
-                    # In these cases, look it up in the normal way so we
-                    # deal with cases where, for instance, users are in group
-                    # users as their primary group.
-                    grname = grp.getgrgid(userlist[f])[0]
-            except Exception, e:
-                pass
-
-        if grname is None:
-            print "User %s is supposed to have their key exported to host %s but their primary group (gid: %d) isn't in LDAP" % (f, CurrentHost, userlist[f])
-            continue
-
-        to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f)
-        # These will only be used where the username doesn't
-        # exist on the target system for some reason; hence,
-        # in those cases, the safest thing is for the file to
-        # be owned by root but group nobody.  This deals with
-        # the bloody obscure case where the group fails to exist
-        # whilst the user does (in which case we want to avoid
-        # ending up with a file which is owned user:root to avoid
-        # a fairly obvious attack vector)
-        to.uid = 0
-        to.gid = 65534
-        # Using the username / groupname fields avoids any need
-        # to give a shit^W^W^Wcare about the UIDoffset stuff.
-        to.uname = f
-        to.gname = grname
-        to.mode  = 0400
-        tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f)))
-
-      tf.close()
-      os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost),
-                os.path.join(OutDir, 'ssh-keys.tar.gz'))
+   GenSSHtarballs(userlist, SSHFiles, grouprevmap, os.path.join(OutDir, 'ssh-keys.tar.gz'))
 
    if ExtraList.has_key("[UNTRUSTED]"):
+     print "[UNTRUSTED] tag is obsolete and may be removed in the future."
      continue;
    if not ExtraList.has_key("[NOPASSWD]"):
      GenShadow(l,OutDir+"shadow");
 
-   # Link in global things   
-   DoLink(GlobalDir,OutDir,"markers");
+   # Link in global things
+   if not ExtraList.has_key("[NOMARKERS]"):
+     DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
    DoLink(GlobalDir,OutDir,"mail-disable");
    DoLink(GlobalDir,OutDir,"mail-greylist");
@@ -1025,7 +1089,7 @@ while(1):
    if ExtraList.has_key("[DNS]"):
       GenDNS(l,OutDir+"dns-zone",Split[1]);
       GenSSHFP(l,OutDir+"dns-sshfp",Split[1])
-      
+
    if ExtraList.has_key("[BSMTP]"):
       GenBSMTP(l,OutDir+"bsmtp",Split[1])
 
@@ -1039,3 +1103,7 @@ while(1):
      for k in Keyrings:
        try: posix.remove(OutDir+os.path.basename(k));
        except: pass;
+
+# vim:set et:
+# vim:set ts=3:
+# vim:set shiftwidth=3: