X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=f3ffc4c678be75d617d00b5d1d7013953b6e07bc;hb=653566b328a70f1f4b765967d72660ebae44473e;hp=30a11110f45a14494a3497e33b25cedcc4fa09d2;hpb=9d9ce4ef419c4db71961d665143c212a6ee6183a;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 30a1111..f3ffc4c 100755
--- a/ud-generate
+++ b/ud-generate
@@ -723,6 +723,8 @@ def GenSSHKnown(l,File):
       if SHost != None: HostNames += [Host[0:SHost]]
 
       IPAdressesT = None
+      IPAdresses = []
+      # get IP adresses back as "proto adress" to distinguish between v4 and v6
       try:
          IPAdressesT = set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)])
       except:
@@ -730,8 +732,9 @@ def GenSSHKnown(l,File):
       for addr in IPAdressesT:
          if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]]
 	 else: IPAdresses += [addr[1]]
+
       for I in x[1]["sshRSAHostKey"]:
-         Line = "%s,%s %s" %(",".join(HostNames + IPAdresses), I);
+         Line = "%s %s" %(",".join(HostNames + IPAdresses), I);
          Line = Sanitize(Line) + "\n";
          F.write(Line);
   # Oops, something unspeakable happened.