ip2host: fixed so that only vlan is returned if no other network information is...

diff --git a/lib/TSD/common.py b/lib/TSD/common.py
index 2c3d2c181dbf83fca0ba77c3eb7d62fb229a3888..cc9bacbe8acedd7e743e1e6b503bf9a413c74f89 100644 (file)
--- a/lib/TSD/common.py
+++ b/lib/TSD/common.py
@@ -138,9 +138,9 @@ Find network information about a host
     dnsinfo = socket.getaddrinfo(hostname, None)
     for (family, socktype, proto, canonname, sockaddr) in dnsinfo:
         if socket.AF_INET == family:
-            ipv4addr['ipv4addr'] = sockaddr[0]
+            network['ipv4addr'] = sockaddr[0]
         elif socket.AF_INET6 == family:
-            ipv6addr['ipv6addr'] = sockaddr[0]
+            network['ipv6addr'] = sockaddr[0]
     hostres = lref.search_s(ldap_base(), ldap.SCOPE_SUBTREE, \
                             '(&(objectclass=computer)(dNSHostName=%s))' % hostname.lower(), \
                             ['networkAddress'])
@@ -158,11 +158,15 @@ Find network information about a host
                 network['vlan'] = vlan4
                 network['ipv4prefix'] = prefix4
                 network['ipv4network'] = network4
+            else:
+                network['vlan'] = ipv4
             if "/" in ipv6:
                 vlan6, network6, prefix6 = ipv6.split("/")
                 network['ipv6prefix'] = prefix6
                 network['ipv6network'] = network6
                 network['vlan'] = vlan6
+            else:
+                network['vlan'] = ipv6
     return network
 
 def testfuncs():