From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 27 Jun 2011 17:10:44 +0000 (-0400)
Subject: Fix handling of RES_USE_INET6 big in nscd
X-Git-Tag: glibc-2.15~505
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=034807a9cbddfa9e7d35df4cdb2ecce569a00851;p=platform%2Fupstream%2Fglibc.git

Fix handling of RES_USE_INET6 big in nscd

This fixes BZ #12350 also for nscd.
---

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)
     {