Fix nss_files if /etc/hosts is missing.

This commit is contained in:
Steve Langasek 2009-10-29 22:04:58 -07:00 committed by Ulrich Drepper
parent ee6f35389c
commit 5c53736b52
2 changed files with 11 additions and 1 deletions

View File

@ -1,5 +1,10 @@
2009-10-29 Ulrich Drepper <drepper@redhat.com> 2009-10-29 Ulrich Drepper <drepper@redhat.com>
[BZ #10540]
* nss/nss_files/files-hosts.c (_nss_files_gethostbyname4_r): If
/etc/hosts does not exist set errnop and herrnop appropriately.
Patch by Steve Langasek <vorlon@debian.org>.
[BZ #10553] [BZ #10553]
* malloc/malloc.c (malloc_info): Fix typos in format strings. * malloc/malloc.c (malloc_info): Fix typos in format strings.
Patch by John Sullivan <jsrhbz@kanargh.force9.co.uk>. Patch by John Sullivan <jsrhbz@kanargh.force9.co.uk>.

View File

@ -1,5 +1,5 @@
/* Hosts file parser in nss_files module. /* Hosts file parser in nss_files module.
Copyright (C) 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc. Copyright (C) 1996-2001, 2003-2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -423,6 +423,11 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
if (! keep_stream) if (! keep_stream)
internal_endent (); internal_endent ();
} }
else
{
*errnop = errno;
*herrnop = NO_DATA;
}
__libc_lock_unlock (lock); __libc_lock_unlock (lock);