From: Ulrich Drepper Date: Sat, 14 Aug 2004 08:49:55 +0000 (+0000) Subject: (gaih_inet): Really set ai_canonname only in one entry. X-Git-Tag: cvs/fedora-base~191 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=862275809d077373fe5cc6b906928780fe1a1b6e;p=thirdparty%2Fglibc.git (gaih_inet): Really set ai_canonname only in one entry. --- diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index a2972b1bca9..ef32e68f01a 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -664,7 +664,8 @@ gaih_inet (const char *name, const struct gaih_service *service, } else no_more = __nss_database_lookup ("hosts", NULL, - "dns [!UNAVAIL=return] files", &nip); + "dns [!UNAVAIL=return] files", + &nip); if (__res_maybe_init (&_res, 0) == -1) no_more = 1; @@ -939,11 +940,14 @@ gaih_inet (const char *name, const struct gaih_service *service, memset (sinp->sin_zero, '\0', sizeof (sinp->sin_zero)); } - if (c) + if (namelen != 0) { (*pai)->ai_canonname = ((void *) (*pai) + sizeof (struct addrinfo) + socklen); strcpy ((*pai)->ai_canonname, c); + + /* We do not need to allocate the canonical name anymore. */ + namelen = 0; } else (*pai)->ai_canonname = NULL;