diff options
| author | Damien Miller <djm@mindrot.org> | 2008-07-14 21:37:36 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-07-14 21:37:36 +1000 |
| commit | c4657ef1818c67e91115389a69ef783412fd54b7 (patch) | |
| tree | f86bf4b3212b32010f473baa414a5321a0f99aee /openbsd-compat/fake-rfc2553.c | |
| parent | 1fc231cbb50f899a1aa6c919c4d7750876b01f2e (diff) | |
| download | openssh-git-c4657ef1818c67e91115389a69ef783412fd54b7.tar.gz | |
- (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h]
return EAI_FAMILY when trying to lookup unsupported address family;
from vinschen AT redhat.com
Diffstat (limited to 'openbsd-compat/fake-rfc2553.c')
| -rw-r--r-- | openbsd-compat/fake-rfc2553.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c index b6ea3d21..096d9e09 100644 --- a/openbsd-compat/fake-rfc2553.c +++ b/openbsd-compat/fake-rfc2553.c @@ -51,6 +51,8 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, struct hostent *hp; char tmpserv[16]; + if (sa->sa_family != AF_UNSPEC && sa->sa_family != AF_INET) + return (EAI_FAMILY); if (serv != NULL) { snprintf(tmpserv, sizeof(tmpserv), "%d", ntohs(sin->sin_port)); if (strlcpy(serv, tmpserv, servlen) >= servlen) @@ -95,6 +97,8 @@ gai_strerror(int err) return ("memory allocation failure."); case EAI_NONAME: return ("nodename nor servname provided, or not known"); + case EAI_FAMILY: + return ("ai_family not supported"); default: return ("unknown/invalid error."); } @@ -159,6 +163,9 @@ getaddrinfo(const char *hostname, const char *servname, u_long addr; port = 0; + if (hints && hints->ai_family != AF_UNSPEC && + hints->ai_family != AF_INET) + return (EAI_FAMILY); if (servname != NULL) { char *cp; |