aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-27 13:10:44 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-27 13:10:44 -0400
commit034807a9cbddfa9e7d35df4cdb2ecce569a00851 (patch)
tree67dfe27afb30623f6867b0f48f0d286b6b102c2b
parent4902da17c8a413ed289528c08a6706d5cdb018dc (diff)
downloadglibc-034807a9cbddfa9e7d35df4cdb2ecce569a00851.zip
glibc-034807a9cbddfa9e7d35df4cdb2ecce569a00851.tar.gz
glibc-034807a9cbddfa9e7d35df4cdb2ecce569a00851.tar.bz2
Fix handling of RES_USE_INET6 big in nscd
This fixes BZ #12350 also for nscd.
-rw-r--r--ChangeLog4
-rw-r--r--nscd/aicache.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87c90c3..b545852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-06-27 Ulrich Drepper <drepper@gmail.com>
+ [BZ #12350]
+ * nscd/aicache.c (addhstaiX): Restore only RES_USE_INET6
+ bit from old_res_options.
+
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-servicescache.c): Define.
* inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 3190a13..6c8d83a 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -534,7 +534,7 @@ next_nip:
}
out:
- _res.options = old_res_options;
+ _res.options |= old_res_options & RES_USE_INET6;
if (dataset != NULL && !alloca_used)
{