From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 30 May 2011 01:43:33 +0000 (-0400)
Subject: Recognize use-vc option in resolv.conf
X-Git-Tag: glibc-2.14~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16985fd0c79ccffc105d77c9076ab0a4bb0e5714;p=platform%2Fupstream%2Fglibc.git

Recognize use-vc option in resolv.conf
---

diff --git a/ChangeLog b/ChangeLog
index ab594aa..a003ac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-29  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #11558]
+	* resolv/res_init.c (res_setoptions): Recognize use-vc option and
+	set RES_USEVC.
+
 	[BZ #11634]
 	* elf/Makefile (tests): Don't add tst-audit[67] without working -mavx.
 
diff --git a/NEWS b/NEWS
index d5ecb80..fdd8a63 100644
--- a/NEWS
+++ b/NEWS
@@ -10,14 +10,15 @@ Version 2.14
 * The following bugs are resolved with this release:
 
   386, 6420, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258,
-  11487, 11532, 11578, 11634, 11653, 11668, 11697, 11724, 11781, 11799,
-  11820, 11837, 11857, 11869, 11892, 11895, 11901, 11945, 11947, 11952,
-  11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432,
-  12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510, 12511,
-  12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601,
-  12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12671, 12681,
-  12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746,
-  12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813, 12814
+  11487, 11532, 11558, 11578, 11634, 11653, 11668, 11697, 11724, 11781,
+  11799, 11820, 11837, 11857, 11869, 11892, 11895, 11901, 11945, 11947,
+  11952, 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420,
+  12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510,
+  12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597,
+  12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12671,
+  12681, 12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738,
+  12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, 12811, 12813,
+  12814
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 7588432..2908c10 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -550,6 +550,8 @@ res_setoptions(res_state statp, const char *options, const char *source) {
 			   !strncmp(cp, "no-tld-query",
 				    sizeof("no-tld-query") - 1)) {
 			statp->options |= RES_NOTLDQUERY;
+		} else if (!strncmp(cp, "use-vc", sizeof("use-vc") - 1)) {
+			statp->options |= RES_USEVC;
 		} else {
 			/* XXX - print a warning here? */
 		}