diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-01 19:50:14 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-01 19:50:14 +0000 |
| commit | 24f59ab9fb347e7e6130057ebd1042883c07595b (patch) | |
| tree | 517bbb32163c996bd8fdbb938930df263e4e6186 /network_io | |
| parent | d44387599585cebeb124698a194a6e4c2bae6c11 (diff) | |
| download | libapr-24f59ab9fb347e7e6130057ebd1042883c07595b.tar.gz | |
* network_io/unix/sockaddr.c (call_resolver): Fix lookups with NULL
hostname for Tru64 5.0 getaddrinfo(), which doesn't handle non-NULL
servname arguments very well.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65145 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io')
| -rw-r--r-- | network_io/unix/sockaddr.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index b44af84da..f7d0e34be 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -309,6 +309,17 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa, /* getaddrinfo according to RFC 2553 must have either hostname * or servname non-NULL. */ +#ifdef OSF1 + /* The Tru64 5.0 getaddrinfo() can only resolve services given + * by the name listed in /etc/services; a numeric or unknown + * servname gets an EAI_SERVICE error. So just resolve the + * appropriate anyaddr and fill in the port later. */ + hostname = family == AF_INET6 ? "::" : "0.0.0.0"; + servname = NULL; +#ifdef AI_NUMERICHOST + hints.ai_flags |= AI_NUMERICHOST; +#endif +#else #ifdef _AIX /* But current AIX getaddrinfo() doesn't like servname = "0"; * the "1" won't hurt since we use the port parameter to fill @@ -318,8 +329,9 @@ static apr_status_t call_resolver(apr_sockaddr_t **sa, servname = "1"; } else -#endif +#endif /* _AIX */ servname = apr_itoa(p, port); +#endif /* OSF1 */ } error = getaddrinfo(hostname, servname, &hints, &ai_list); #ifdef HAVE_GAI_ADDRCONFIG |