This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.10-385-g5c53736
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Oct 2009 05:05:27 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-385-g5c53736
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5c53736b52d5032171813d813d4a7ad505102b61 (commit)
from ee6f35389c751b93fd7298ec02f642587d996c71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c53736b52d5032171813d813d4a7ad505102b61
commit 5c53736b52d5032171813d813d4a7ad505102b61
Author: Steve Langasek <vorlon@debian.org>
Date: Thu Oct 29 22:04:58 2009 -0700
Fix nss_files if /etc/hosts is missing.
diff --git a/ChangeLog b/ChangeLog
index ed055a7..3fae505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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]
* malloc/malloc.c (malloc_info): Fix typos in format strings.
Patch by John Sullivan <jsrhbz@kanargh.force9.co.uk>.
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index 7b69d47..68fb969 100644
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -1,5 +1,5 @@
/* 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.
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)
internal_endent ();
}
+ else
+ {
+ *errnop = errno;
+ *herrnop = NO_DATA;
+ }
__libc_lock_unlock (lock);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
nss/nss_files/files-hosts.c | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources