[glibc] Initialize res_hconf in nscd

[Siddhesh Poyarekar]

commit 97490e6a11e8e88ce07df41cb289b08af200d32d
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Mon Aug 26 12:23:11 2013 +0530

    Initialize res_hconf in nscd

 glibc-rh1000924.patch |   24 ++++++++++++++++++++++++
 glibc.spec            |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh1000924.patch b/glibc-rh1000924.patch
new file mode 100644
index 0000000..6010624
--- /dev/null
+++ b/glibc-rh1000924.patch
@@ -0,0 +1,24 @@
+diff -pruN glibc-2.18/nscd/aicache.c glibc-2.18.new/nscd/aicache.c
+--- glibc-2.18/nscd/aicache.c	2013-08-11 04:22:55.000000000 +0530
++++ glibc-2.18.new/nscd/aicache.c	2013-08-26 11:10:25.843470413 +0530
+@@ -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,8 +101,11 @@ addhstaiX (struct database_dyn *db, int
+     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;
++    no_more = 1;
+ 
+   /* If we are looking for both IPv4 and IPv6 address we don't want
+      the lookup functions to automatically promote IPv4 addresses to
diff --git a/glibc.spec b/glibc.spec
index 3bc0ebf..2b234f7 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.18
 %define glibcversion 2.18
-%define glibcrelease 3%{?dist}
+%define glibcrelease 4%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -214,6 +214,9 @@ Patch2027: %{name}-rh819430.patch
 
 #Upstream BZ 14547
 Patch2028: %{name}-strcoll-cve.patch
+
+# Initialize res_hconf in nscd
+Patch2029: %{name}-rh1000924.patch
 ##############################################################################
 # End of glibc patches.
 ##############################################################################
@@ -534,6 +537,7 @@ package or when debugging this package.
 %patch0040 -p1
 %patch0041 -p1
 %patch0042 -p1
+%patch2029 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1619,6 +1623,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Aug 26 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18-4
+- Initialize res_hconf in nscd. (#1000924).
+
 * Tue Aug 20 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18-3
 - Remove non-ELF support in rtkaio.
 - Avoid inlining of cleanup function for kaio_suspend.