more sanitizing for IP adresses
authorAndreas Barth <aba@alioth>
Sat, 10 May 2008 21:52:42 +0000 (21:52 +0000)
committerAndreas Barth <aba@alioth>
Sat, 10 May 2008 21:52:42 +0000 (21:52 +0000)
ud-generate

index 30a1111..d2f00ab 100755 (executable)
@@ -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,6 +732,7 @@ 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 = Sanitize(Line) + "\n";