glibc: Backport hotfixes from RHEL6.
[people/teissler/ipfire-2.x.git] / src / patches / glibc / glibc-rh970090.patch
1 diff -pruN glibc-2.18/nscd/aicache.c glibc-2.18.new/nscd/aicache.c
2 --- glibc-2.18/nscd/aicache.c 2013-08-11 04:22:55.000000000 +0530
3 +++ glibc-2.18.new/nscd/aicache.c 2013-08-26 11:10:25.843470413 +0530
4 @@ -25,6 +25,7 @@
5 #include <time.h>
6 #include <unistd.h>
7 #include <sys/mman.h>
8 +#include <resolv/res_hconf.h>
9
10 #include "dbg_log.h"
11 #include "nscd.h"
12 @@ -100,8 +101,11 @@ addhstaiX (struct database_dyn *db, int
13 no_more = __nss_database_lookup ("hosts", NULL,
14 "dns [!UNAVAIL=return] files", &nip);
15
16 + /* Initialize configurations. */
17 + if (__builtin_expect (!_res_hconf.initialized, 0))
18 + _res_hconf_init ();
19 if (__res_maybe_init (&_res, 0) == -1)
20 - no_more = 1;
21 + no_more = 1;
22
23 /* If we are looking for both IPv4 and IPv6 address we don't want
24 the lookup functions to automatically promote IPv4 addresses to