Fix client install on IPv6 machines.

ticket 1804
This commit is contained in:
Jan Cholasta 2011-09-19 11:41:31 +02:00 committed by Martin Kosek
parent b5a6cd91e8
commit f83c773a36

View File

@ -648,8 +648,13 @@ def resolve_ipaddress(server):
"""
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP)
s.connect((server, 389))
addr, port = s.getsockname()
try:
s.connect((server, 389))
addr, port = s.getsockname()
except socket.gaierror:
s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, socket.IPPROTO_TCP)
s.connect((server, 389))
addr, port, foo, bar = s.getsockname()
s.close()
return addr