diff options
author | Jan Cholasta <jcholast@redhat.com> | 2011-09-19 11:41:31 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-09-19 18:11:24 +0200 |
commit | 7854d8166e54e0d39c51750a421ebc9b5a347233 (patch) | |
tree | 57bfe06308138f18123ed575d5b7444de58f3e5c /ipa-client/ipa-install | |
parent | 8c451705827398d6e7a6d8e9177c80c2d1845f95 (diff) | |
download | freeipa-7854d8166e54e0d39c51750a421ebc9b5a347233.tar.gz freeipa-7854d8166e54e0d39c51750a421ebc9b5a347233.tar.xz freeipa-7854d8166e54e0d39c51750a421ebc9b5a347233.zip |
Fix client install on IPv6 machines.
ticket 1804
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 65f3d1321..6aca5d240 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -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 |