summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2011-09-19 11:41:31 +0200
committerMartin Kosek <mkosek@redhat.com>2011-09-19 18:11:47 +0200
commitf83c773a361e2ca7d1b2626879eb2feff975e15c (patch)
treef2fc7d0ca7510323df05506828a27a92c880b61d /ipa-client/ipa-install
parentb5a6cd91e86bfcfad08f372afa713dea4731752e (diff)
downloadfreeipa-f83c773a361e2ca7d1b2626879eb2feff975e15c.tar.gz
freeipa-f83c773a361e2ca7d1b2626879eb2feff975e15c.tar.xz
freeipa-f83c773a361e2ca7d1b2626879eb2feff975e15c.zip
Fix client install on IPv6 machines.
ticket 1804
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install9
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 b3b8b7788..44c2f5fbc 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