From 0f1e140e796f55cf5f07d39707f3e88d335f4ff1 Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Wed, 10 Dec 2008 16:39:54 +0000
Subject: Merge changes between r7357 and r7510 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@7511 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/inet/getnameinfo.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libc/inet/getnameinfo.c')

diff --git a/libc/inet/getnameinfo.c b/libc/inet/getnameinfo.c
index 50240383f..db6b5c7ee 100644
--- a/libc/inet/getnameinfo.c
+++ b/libc/inet/getnameinfo.c
@@ -178,6 +178,9 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
   if (sa == NULL || addrlen < sizeof (sa_family_t))
     return EAI_FAMILY;
 
+  if ((flags & NI_NAMEREQD) && host == NULL && serv == NULL)
+    return EAI_NONAME;
+
   switch (sa->sa_family)
     {
     case AF_LOCAL:
-- 
cgit v1.2.3