OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update.

Browse Source 
2002-12-16  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/posix/getaddrinfo.c (gaih_inet): If __nss_lookup_function
	fails to return a function pointer don't use it.
This commit is contained in:
Ulrich Drepper 2002-12-17 01:16:31 +00:00
parent f83c716436
commit 64ab2317a8
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-12-16 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): If __nss_lookup_function
fails to return a function pointer don't use it.
2002-12-16 Art Haas <ahaas@airmail.net>
* io/ftw.c: Convert GCC extension initializer syntax to C99.

37
sysdeps/posix/getaddrinfo.c
View File

@ -570,25 +570,28 @@ gaih_inet (const char *name, const struct gaih_service *service,
{
fct = __nss_lookup_function (nip, "gethostbyname2_r");
gethosts2 (AF_INET6, struct in6_addr);
no_inet6_data = no_data;
inet6_status = status;
gethosts2 (AF_INET, struct in_addr);
if (fct != NULL)
{
gethosts2 (AF_INET6, struct in6_addr);
no_inet6_data = no_data;
inet6_status = status;
gethosts2 (AF_INET, struct in_addr);
/* If we found one address for AF_INET or AF_INET6,
don't continue the search. */
if (inet6_status == NSS_STATUS_SUCCESS ||
status == NSS_STATUS_SUCCESS)
break;
/* If we found one address for AF_INET or AF_INET6,
don't continue the search. */
if (inet6_status == NSS_STATUS_SUCCESS ||
status == NSS_STATUS_SUCCESS)
break;
/* We can have different states for AF_INET
and AF_INET6. Try to find a usefull one for
both. */
if (inet6_status == NSS_STATUS_TRYAGAIN)
status = NSS_STATUS_TRYAGAIN;
else if (status == NSS_STATUS_UNAVAIL &&
inet6_status != NSS_STATUS_UNAVAIL)
status = inet6_status;
/* We can have different states for AF_INET
and AF_INET6. Try to find a usefull one for
both. */
if (inet6_status == NSS_STATUS_TRYAGAIN)
status = NSS_STATUS_TRYAGAIN;
else if (status == NSS_STATUS_UNAVAIL &&
inet6_status != NSS_STATUS_UNAVAIL)
status = inet6_status;
}
if (nss_next_action (nip, status) == NSS_ACTION_RETURN)
break;