From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 23 Jun 2011 04:13:32 +0000 (+0000)
Subject: Use AI_ADDRCONFIG unconditionally in kpropd
X-Git-Tag: krb5-1.10-alpha1~397
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a37f9319e143c0db50351cc3f6e270b677bdacc1;p=krb5.git

Use AI_ADDRCONFIG unconditionally in kpropd

fake-addrinfo.h ensures that AI_ADDRCONFIG is defined, so we don't
need #ifdef tests when we use it.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24976 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 259d63368..d20d86561 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -245,11 +245,7 @@ get_wildcard_addr(struct addrinfo **res)
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-    /* Try to avoid IPv6 if the host has no IPv6 interface addresses. */
-    hints.ai_flags |= AI_ADDRCONFIG;
-#endif
+    hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
 #ifdef KRB5_USE_INET6
     hints.ai_family = AF_INET6;
     error = getaddrinfo(NULL, port, &hints, res);