From 034807a9cbddfa9e7d35df4cdb2ecce569a00851 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 27 Jun 2011 13:10:44 -0400
Subject: [PATCH] Fix handling of RES_USE_INET6 big in nscd

This fixes BZ #12350 also for nscd.
---
 ChangeLog      | 4 ++++
 nscd/aicache.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 87c90c3b9f..b545852768 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 3190a13b06..6c8d83a7ad 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -534,7 +534,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
    }
 
  out:
-  _res.options = old_res_options;
+  _res.options |= old_res_options & RES_USE_INET6;
 
   if (dataset != NULL && !alloca_used)
     {