From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 14 Aug 2004 06:47:48 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~17671
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c81b3e1b77a3f47a4f29e21c5e61d12a7369e93;p=external%2Fglibc.git

Update.

	* nss/getent.c (ahosts_keys): ai_canonname is NULL for all but the
	first returned entry.  Print name only if not NULL.
---

diff --git a/ChangeLog b/ChangeLog
index f809ef8..5b6b668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* nss/getent.c (ahosts_keys): ai_canonname is NULL for all but the
+	first returned entry.  Print name only if not NULL.
+
 	* nis/nss_nis/nis-netgrp.c: Remove locking by using data in struct
 	__netgrent object passed in instead of global variables.
 	Optimize.
diff --git a/nss/getent.c b/nss/getent.c
index bcc363d..4be9535 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -348,7 +348,7 @@ ahosts_keys (int number, char *key[])
 				 &((struct sockaddr_in *) runp->ai_addr)->sin_addr,
 				 buf, sizeof (buf)),
 		      sockstr,
-		      runp->ai_canonname);
+		      runp->ai_canonname ?: "");
 
 	      runp = runp->ai_next;
 	    }