diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-08-30 01:55:40 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-08-30 01:55:40 +0000 |
| commit | 595a11922fbe9db810d164b13c203afe78d73851 (patch) | |
| tree | d47a20429de95fd56cb27ac884ee91306681e471 | |
| parent | 078fda0b90ecc040ea8d4ba2130eb46bc567f480 (diff) | |
| download | krb5-595a11922fbe9db810d164b13c203afe78d73851.tar.gz krb5-595a11922fbe9db810d164b13c203afe78d73851.tar.xz krb5-595a11922fbe9db810d164b13c203afe78d73851.zip | |
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
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/fake-addrinfo.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index bbc9bdce64..2b6e007788 100644 --- 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 21e968cc2a..e620357da2 100644 --- 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 /* |