While libc5 isn't one of our supported configurations, this is a simple enough

change.  It should be in the 1.4 release.  (Next 1.3.x release? I don't know.)

* fake-addrinfo.h (WRAP_GETADDRINFO, COPY_FIRST_CANONNAME): Don't define on
Linux unless HAVE_GETADDRINFO is defined, for libc5 compatibility.

ticket: 1711
tags: pullup

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index bbc9bdce641e98be3b5fb458e253ae5efa4f0c4d..2b6e00778838806be2289573bfa0fc87a8b61efa 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+       * fake-addrinfo.h (WRAP_GETADDRINFO, COPY_FIRST_CANONNAME): Don't
+       define on Linux unless HAVE_GETADDRINFO is defined, for libc5
+       compatibility.
+
 2003-08-26  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5.hin (struct _krb5_donot_replay, krb5_rc_default)

diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
index 21e968cc2a62f921ba3071398721cdb7e27a51df..e620357da2d66768d5d5d281b25a73d686876d93 100644 (file)
--- a/src/include/fake-addrinfo.h
+++ b/src/include/fake-addrinfo.h
@@ -145,12 +145,12 @@ extern /*@dependent@*/ char *gai_strerror (int code) /*@*/;
 #define FAI_CACHE
 #endif
 
-#if defined (__linux__) || defined (_AIX)
+#if (defined (__linux__) && defined(HAVE_GETADDRINFO)) || defined (_AIX)
 /* See comments below.  */
 #  define WRAP_GETADDRINFO
 #endif
 
-#ifdef __linux__
+#if defined (__linux__) && defined(HAVE_GETADDRINFO)
 # define COPY_FIRST_CANONNAME
 #endif
 
@@ -1209,7 +1209,9 @@ getaddrinfo (const char *name, const char *serv, const struct addrinfo *hint,
        set, the returned ai_canonname field can be null.  The NetBSD
        1.5 implementation also does this, if the input hostname is a
        numeric host address string.  That case isn't handled well at
-       the moment.  */
+       the moment.
+
+       Libc version 5 didn't have getaddrinfo at all.  */
 
 #ifdef COPY_FIRST_CANONNAME
     /*