remove (unused) tdb files

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

diff --git a/ud-generate b/ud-generate
index f9f8841..bd06cbe 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -2,7 +2,7 @@
 # -*- mode: python -*-
 # Generates passwd, shadow and group files from the ldap directory.
 
-import string, re, time, ldap, getopt, sys, os, pwd, posix;
+import string, re, time, ldap, getopt, sys, os, pwd, posix, socket;
 from userdir_ldap import *;
 
 PasswdAttrs = None;
@@ -11,7 +11,7 @@ Allowed = None;
 CurrentHost = "";
 
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
-BSMTPCheck = re.compile(".*mx 0 klecker\.debian\.org\..*",re.DOTALL);
+BSMTPCheck = re.compile(".*mx 0 (klecker|gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
 
 def Sanitize(Str):
@@ -69,17 +69,14 @@ def Done(File,F,Fdb):
 # Generate the password list
 def GenPasswd(l,File,HomePrefix):
   F = None;
-  Fdb = None;
   try:
    F = open(File + ".tmp","w");
-   Fdb = open(File + ".tdb.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 or IsInGroup(x) == 0:
          continue;
@@ -93,25 +90,19 @@ def GenPasswd(l,File,HomePrefix):
               GetAttr(x,"gecos"),HomePrefix,GetAttr(x,"uid"),\
               GetAttr(x,"loginshell"));
       F.write(Line);
-      Fdb.write("0%u %s" % (I,Line));
-      Fdb.write(".%s %s" % (GetAttr(x,"uid"),Line));
-      Fdb.write("=%s %s" % (GetAttr(x,"uidnumber"),Line));
-      I = I + 1;
 
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
 
 # Generate the shadow list
 def GenShadow(l,File):
   F = None;
-  Fdb = None;
   try:
    OldMask = os.umask(0077);
    F = open(File + ".tmp","w",0600);
-   Fdb = open(File + ".tdb.tmp","w",0600);
    os.umask(OldMask);
 
    # Fetch all the users
@@ -119,7 +110,6 @@ def GenShadow(l,File):
    if PasswdAttrs == None:
       raise "No Users";
 
-   I = 0;
    for x in PasswdAttrs:
       if x[1].has_key("uidnumber") == 0 or IsInGroup(x) == 0:
          continue;
@@ -136,24 +126,19 @@ def GenShadow(l,File):
               GetAttr(x,"shadowexpire"));
       Line = Sanitize(Line) + "\n";
       F.write(Line);
-      Fdb.write("0%u %s" % (I,Line));
-      Fdb.write(".%s %s" % (GetAttr(x,"uid"),Line));
-      I = I + 1;
 
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
 
 # Generate the shadow list
 def GenSSHShadow(l,File):
   F = None;
-  Fdb = None;
   try:
    OldMask = os.umask(0077);
    F = open(File + ".tmp","w",0600);
-   Fdb = os.popen("cdbmake %s.cdb %s.cdb.tmp"%(File,File),"w");
    os.umask(OldMask);
 
    # Fetch all the users
@@ -161,7 +146,6 @@ def GenSSHShadow(l,File):
    if PasswdAttrs == None:
       raise "No Users";
 
-   I = 0;
    for x in PasswdAttrs:
       if x[1].has_key("uidnumber") == 0 or \
          x[1].has_key("sshrsaauthkey") == 0:
@@ -171,57 +155,17 @@ def GenSSHShadow(l,File):
          Line = "%s: %s" %(User,I);
          Line = Sanitize(Line) + "\n";
          F.write(Line);
-         Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(I),User,I));
-   Fdb.write("\n");
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  if Fdb.close() != None:
-     raise "cdbmake gave an error";
   Done(File,F,None);
 
-def GenSSH2Shadow(l,File):
-  F = None;
-  Fdb = None;
-  try:
-   OldMask = os.umask(0077);
-   F = open(File + ".tmp","w",0600);
-   Fdb = os.popen("cdbmake %s.cdb %s.cdb.tmp"%(File,File),"w");
-   os.umask(OldMask);
-
-   # 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 or \
-         x[1].has_key("sshdsaauthkey") == 0:
-         continue;
-      for I in x[1]["sshdsaauthkey"]:
-         User = GetAttr(x,"uid");
-         Line = "%s: %s" %(User,I);
-         Line = Sanitize(Line) + "\n";
-         F.write(Line);
-         Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(I),User,I));
-   Fdb.write("\n");
-  # Oops, something unspeakable happened.
-  except:
-   Die(File,F,Fdb);
-   raise;
-  if Fdb.close() != None:
-     raise "cdbmake gave an error";
-  Done(File,F,None);
-  
 # Generate the group list
 def GenGroup(l,File):
   F = None;
-  Fdb = None;
   try:
    F = open(File + ".tmp","w");
-   Fdb = open(File + ".tdb.tmp","w");
 
    # Generate the GroupMap
    GroupMap = {};
@@ -247,7 +191,6 @@ def GenGroup(l,File):
             print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it";
            
    # Output the group file.
-   Counter = 0; 
    for x in GroupMap.keys():
       if GroupIDMap.has_key(x) == 0:
          continue;
@@ -258,16 +201,12 @@ def GenGroup(l,File):
         Comma = ',';
       Line = Sanitize(Line) + "\n";
       F.write(Line);
-      Fdb.write("0%u %s" % (Counter,Line));
-      Fdb.write(".%s %s" % (x,Line));
-      Fdb.write("=%u %s" % (GroupIDMap[x],Line));
-      Counter = Counter + 1;
       
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
 
 # Generate the email forwarding list
 def GenForward(l,File):
@@ -471,6 +410,41 @@ def GenDNS(l,File,BSMTPFile,HomePrefix):
   Done(File,F,None);
   Done(BSMTPFile,FB,None);
 
+# Generate the shadow list
+def GenSSHKnown(l,File):
+  F = None;
+  try:
+   OldMask = os.umask(0022);
+   F = open(File + ".tmp","w",0644);
+   os.umask(OldMask);
+
+   # Fetch all the hosts
+   HostKeys = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshrsahostkey=*",\
+                ["hostname","sshrsahostkey"]);
+   
+   if HostKeys == None:
+      raise "No Hosts";
+
+   for x in HostKeys:
+      if x[1].has_key("hostname") == 0 or \
+         x[1].has_key("sshrsahostkey") == 0:
+         continue;
+      Host = GetAttr(x,"hostname");
+      SHost = string.find(Host,".");
+      for I in x[1]["sshrsahostkey"]:
+         if SHost == None:
+            Line = "%s,%s %s" %(Host,socket.gethostbyname(Host),I);
+         else:
+            Line = "%s,%s,%s %s" %(Host,Host[0:SHost],socket.gethostbyname(Host),I);
+         Line = Sanitize(Line) + "\n";
+         F.write(Line);
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
+
 # Connect to the ldap server
 l = ldap.open(LDAPServer);
 F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
@@ -496,7 +470,7 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                  "shadowmin","shadowmax","shadowwarning","shadowinactive",
                 "shadowexpire","emailforward","latitude","longitude",\
                  "allowedhosts","sshrsaauthkey","dnszoneentry","cn","sn",\
-                "keyfingerprint","privatesub","sshdsaauthkey"]);
+                "keyfingerprint","privatesub"]);
 
 # Open the control file
 if len(sys.argv) == 1:
@@ -506,11 +480,11 @@ else:
 
 # Generate global things
 GlobalDir = GenerateDir+"/";
-GenSSH2Shadow(l,GlobalDir+"ssh-dsa-shadow");
 GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow");
 GenAllForward(l,GlobalDir+"mail-forward.cdb");
 GenMarkers(l,GlobalDir+"markers");
 GenPrivate(l,GlobalDir+"debian-private");
+GenSSHKnown(l,GlobalDir+"ssh_known_hosts");
 
 # Compatibility.
 GenForward(l,GlobalDir+"forward-alias");
@@ -553,9 +527,9 @@ while(1):
        
    # Link in global things   
    DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
-   DoLink(GlobalDir,OutDir,"ssh-rsa-shadow.cdb");
    DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
+   DoLink(GlobalDir,OutDir,"ssh_known_hosts");
 
    # Compatibility.
    DoLink(GlobalDir,OutDir,"forward-alias");