diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-02-19 21:34:13 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-02-19 21:34:13 +0000 |
| commit | 20b1b2a6c0f53d2faa32e784c495463bbc3d58c0 (patch) | |
| tree | 079b4551bdfaec450532e0726d0c62ccfe40b156 /src/include | |
| parent | 82875d4d15d9e92b5a56e6398eb0ae81e2a7eff6 (diff) | |
| download | krb5-20b1b2a6c0f53d2faa32e784c495463bbc3d58c0.tar.gz krb5-20b1b2a6c0f53d2faa32e784c495463bbc3d58c0.tar.xz krb5-20b1b2a6c0f53d2faa32e784c495463bbc3d58c0.zip | |
* fake-addrinfo.c (_XOPEN_SOURCE_EXTENDED): Define if not defined, and if not
Mac or Windows, for duration of inclusion of netdb.h. This gets us the h_errno
declaration on HP-UX.
(getnameinfo): Cast gethostbyaddr pointer arg to char *, not sockaddr *.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14147 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/fake-addrinfo.c | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 3b405fa08..622df4e28 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +2002-02-19 Ken Raeburn <raeburn@mit.edu> + + * fake-addrinfo.c (_XOPEN_SOURCE_EXTENDED): Define if not defined, + and if not Mac or Windows, for duration of inclusion of netdb.h. + This gets us the h_errno declaration on HP-UX. + (getnameinfo): Cast gethostbyaddr pointer arg to char *, not + sockaddr *. + 2002-02-10 Ken Raeburn <raeburn@mit.edu> * fake-addrinfo.h: Always check for FAI_PREFIX, not just when fake diff --git a/src/include/fake-addrinfo.c b/src/include/fake-addrinfo.c index 1f0047213..a78e9daf4 100644 --- a/src/include/fake-addrinfo.c +++ b/src/include/fake-addrinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 by the Massachusetts Institute of Technology, + * Copyright (C) 2001,2002 by the Massachusetts Institute of Technology, * Cambridge, MA, USA. All Rights Reserved. * * This software is being provided to you, the LICENSEE, by the @@ -48,6 +48,13 @@ #include "fake-addrinfo.h" +#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(HAVE_MACSOCK_H) && !defined(_WIN32) +/* Hack for HPUX, to get h_errno. */ +# define _XOPEN_SOURCE_EXTENDED 1 +# include <netdb.h> +# undef _XOPEN_SOURCE_EXTENDED +#endif + void fixup_addrinfo (struct addrinfo *ai) { struct addrinfo *ai2; @@ -263,7 +270,8 @@ int getnameinfo (const struct sockaddr *sa, socklen_t len, else return EAI_FAIL; /* ?? */ } else { - hp = gethostbyaddr ((struct sockaddr *) &sinp->sin_addr, sizeof (struct in_addr), + hp = gethostbyaddr ((const char *) &sinp->sin_addr, + sizeof (struct in_addr), sa->sa_family); if (hp == 0) { if (h_errno == NO_ADDRESS && !(flags & NI_NAMEREQD)) /* ??? */ |