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.18-24-g595aba7
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Aug 2013 10:11:41 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-24-g595aba7
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 595aba70a4c676f7efaf6a012f54cd22aa189c5b (commit)
from ffabd3937aea799d2779e8b1b0a5385eebadd452 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=595aba70a4c676f7efaf6a012f54cd22aa189c5b
commit 595aba70a4c676f7efaf6a012f54cd22aa189c5b
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 26 15:42:29 2013 +0530
Initialize res_hconf in nscd
Fixes BZ #15890.
diff --git a/ChangeLog b/ChangeLog
index 7e7e3c5..9cde901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-26 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ [BZ #15890]
+ * nscd/aicache.c: Include res_hconf.h.
+ (addhstaiX): Initialize res_hconf.
+
2013-08-26 Andreas Schwab <schwab@suse.de>
* stdlib/Makefile (LDFLAGS-tst-tls-atexit): Remove.
diff --git a/NEWS b/NEWS
index 8f204d5..eb26104 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.19
* The following bugs are resolved with this release:
- 14699, 15531, 15532, 15749, 15797, 15867
+ 14699, 15531, 15532, 15749, 15797, 15867, 15890
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 0461b83..dceb4d6 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -25,6 +25,7 @@
#include <time.h>
#include <unistd.h>
#include <sys/mman.h>
+#include <resolv/res_hconf.h>
#include "dbg_log.h"
#include "nscd.h"
@@ -100,6 +101,9 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
no_more = __nss_database_lookup ("hosts", NULL,
"dns [!UNAVAIL=return] files", &nip);
+ /* Initialize configurations. */
+ if (__builtin_expect (!_res_hconf.initialized, 0))
+ _res_hconf_init ();
if (__res_maybe_init (&_res, 0) == -1)
no_more = 1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
nscd/aicache.c | 4 ++++
3 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources