From 5cf17e31800e032ad76366f38d28b2797cd595cc Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Tue, 5 Jun 2012 00:48:37 -0400 Subject: Fix k5test.py hostname canonicalization r25844 (#7124) stopped using AI_ADDRCONFIG when canonicalizing hostnames in sn2princ. So we need to also stop using it in k5test.c's _get_hostname() or we could come up with a different result on a system where forward and reverse resolution via IPv4 and IPv6 produce different results. That in turn causes a t_gssapi.py test (the one using the un-canonicalized hostname) to fail, because libkrb5 looks for a different host principal than k5test.py put in the keytab. --- src/util/k5test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/util/k5test.py b/src/util/k5test.py index 513b9c516..5adfc9596 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -439,8 +439,7 @@ def _find_srctop(): def _get_hostname(): hostname = socket.gethostname() try: - ai = socket.getaddrinfo(hostname, None, 0, 0, 0, - socket.AI_CANONNAME | socket.AI_ADDRCONFIG) + ai = socket.getaddrinfo(hostname, None, 0, 0, 0, socket.AI_CANONNAME) except socket.gaierror, (error, errstr): fail('Local hostname "%s" does not resolve: %s.' % (hostname, errstr)) (family, socktype, proto, canonname, sockaddr) = ai[0] -- cgit