X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=971fec208f89767d2608cb47202952cad01aae29;hb=07e061d6afac847cadcd9aac7a964a0cf269ae90;hp=3dfbc090b2c88ff23e85db7d7e967f1cbb9a899f;hpb=8df900b2158a3ea4b84334f89db7435e81da1ec6;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 3dfbc09..971fec2 100755
--- a/ud-generate
+++ b/ud-generate
@@ -3,7 +3,7 @@
 # Generates passwd, shadow and group files from the ldap directory.
 
 #   Copyright (c) 2000-2001  Jason Gunthorpe <jgg@debian.org>
-#   Copyright (c) 2001-2003  Ryan Murray <rmurray@debian.org>
+#   Copyright (c) 2001-2005  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2003-2004  James Troup <troup@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
 #
@@ -408,6 +408,10 @@ def GenDNS(l,File,HomePrefix):
    for x in PasswdAttrs:
       if x[1].has_key("dnsZoneEntry") == 0:
          continue;
+
+      # If the account has no PGP key, do not write it
+      if x[1].has_key("keyFingerPrint") == 0:
+         continue;
       try:
          F.write("; %s\n"%(EmailAddress(x)));
          for z in x[1]["dnsZoneEntry"]:
@@ -459,6 +463,10 @@ def GenBSMTP(l,File,HomePrefix):
    for x in PasswdAttrs:
       if x[1].has_key("dnsZoneEntry") == 0:
          continue;
+
+      # If the account has no PGP key, do not write it
+      if x[1].has_key("keyFingerPrint") == 0:
+         continue;
       try:
          for z in x[1]["dnsZoneEntry"]:
             Split = string.split(string.lower(z));
@@ -483,7 +491,7 @@ def GenBSMTP(l,File,HomePrefix):
    raise;
   Done(File,F,None);
 
-# Generate the shadow list
+# Generate the ssh known hosts file
 def GenSSHKnown(l,File):
   F = None;
   try:
@@ -517,6 +525,32 @@ def GenSSHKnown(l,File):
    raise;
   Done(File,F,None);
 
+# Generate the debianhosts file (list of all IP addresses)
+def GenHosts(l,File):
+  F = None;
+  try:
+   OldMask = os.umask(0022);
+   F = open(File + ".tmp","w",0644);
+   os.umask(OldMask);
+
+   # Fetch all the hosts
+   HostNames = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"hostname=*",\
+                ["hostname"]);
+   
+   if HostNames == None:
+      raise "No Hosts";
+
+   for x in HostNames:
+      if x[1].has_key("hostname") == 0:
+         continue;
+      Host = GetAttr(x,"hostname");
+      Addr = socket.gethostbyname(Host);
+      F.write(Addr + "\n");
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
 
 # Connect to the ldap server
 l = ldap.open(LDAPServer);
@@ -558,6 +592,7 @@ GenAllForward(l,GlobalDir+"mail-forward.cdb");
 GenMarkers(l,GlobalDir+"markers");
 GenPrivate(l,GlobalDir+"debian-private");
 GenSSHKnown(l,GlobalDir+"ssh_known_hosts");
+GenHosts(l,GlobalDir+"debianhosts");
 
 # Compatibility.
 GenForward(l,GlobalDir+"forward-alias");
@@ -589,6 +624,8 @@ while(1):
          GroupList[str(GroupIDMap[I])] = None;
 
    Allowed = GroupList;
+   if Allowed == {}:
+     Allowed = None
    CurrentHost = Split[0];
 
    sys.stdout.flush();
@@ -604,6 +641,7 @@ while(1):
    DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
    DoLink(GlobalDir,OutDir,"ssh_known_hosts");
+   DoLink(GlobalDir,OutDir,"debianhosts");
 
    # Compatibility.
    DoLink(GlobalDir,OutDir,"forward-alias");