diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-08-21 07:25:45 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-08-21 07:25:45 +0000 |
| commit | 060ce771f6db5e1e92a717ab6b9b926b800d8e45 (patch) | |
| tree | 6355fe9139c06e8690f080437a2e065c4a905e98 /src/include/fake-addrinfo.h | |
| parent | 86c2afb1b1b760f93b730f68e7c4b0c0af924f57 (diff) | |
| download | krb5-060ce771f6db5e1e92a717ab6b9b926b800d8e45.tar.gz krb5-060ce771f6db5e1e92a717ab6b9b926b800d8e45.tar.xz krb5-060ce771f6db5e1e92a717ab6b9b926b800d8e45.zip | |
* fake-addrinfo.h (getnameinfo): Define to my_fake_getnameinfo only if
HAVE_GETADDRINFO is defined.
ticket: 1380
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15784 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/fake-addrinfo.h')
| -rw-r--r-- | src/include/fake-addrinfo.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h index ded8745acd..431ec82237 100644 --- a/src/include/fake-addrinfo.h +++ b/src/include/fake-addrinfo.h @@ -324,6 +324,11 @@ system_freeaddrinfo (struct addrinfo *ai) freeaddrinfo(ai); } +/* Note: Implementations written to RFC 2133 use size_t, while RFC + 2553 implementations use socklen_t, for the second parameter. + + Mac OS X (10.2) and AIX 4.3.3 appear to be in the RFC 2133 camp, + but we don't have an autoconf test for that right now. */ static inline int system_getnameinfo (const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, @@ -339,8 +344,6 @@ system_getnameinfo (const struct sockaddr *sa, socklen_t salen, #define getaddrinfo my_fake_getaddrinfo #undef freeaddrinfo #define freeaddrinfo my_fake_freeaddrinfo -#undef getnameinfo -#define getnameinfo my_fake_getnameinfo #endif @@ -539,14 +542,6 @@ void freeaddrinfo (struct addrinfo *ai); #endif #if !defined (HAVE_GETADDRINFO) -static -int getnameinfo (const struct sockaddr *addr, socklen_t len, - char *host, socklen_t hostlen, - char *service, socklen_t servicelen, - int flags); -#endif - -#if !defined (HAVE_GETADDRINFO) #define HAVE_FAKE_GETADDRINFO /* was not originally HAVE_GETADDRINFO */ #define HAVE_GETADDRINFO @@ -554,11 +549,22 @@ int getnameinfo (const struct sockaddr *addr, socklen_t len, #undef HAVE_GETNAMEINFO #define HAVE_GETNAMEINFO 1 +#undef getnameinfo +#define getnameinfo my_fake_getnameinfo + static char *gai_strerror (int code); #endif +#if !defined (HAVE_GETADDRINFO) +static +int getnameinfo (const struct sockaddr *addr, socklen_t len, + char *host, socklen_t hostlen, + char *service, socklen_t servicelen, + int flags); +#endif + /* Fudge things on older gai implementations. */ /* AIX 4.3.3 is based on RFC 2133; no AI_NUMERICHOST. */ #ifndef AI_NUMERICHOST |