From: Andreas Jaeger <aj@suse.de>
Date: Mon, 29 Apr 2013 19:15:44 +0000 (+0200)
Subject: BZ#15084: Apparent typos in strings in res_debug.c
X-Git-Tag: glibc-2.18~358
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ed8088e4812d4f58bf9f6124106c65be22faef;p=thirdparty%2Fglibc.git

BZ#15084: Apparent typos in strings in res_debug.c

	[BZ #15084]
	* resolv/res_debug.c (p_option): Fix strings for RES_USEBSTRING
	and RES_USEVC.
---

diff --git a/ChangeLog b/ChangeLog
index f4a24ff2b29..fd81ead7666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-29  Andreas Jaeger  <aj@suse.de>
 
+	[BZ #15084]
+	* resolv/res_debug.c (p_option): Fix strings for RES_USEBSTRING
+	and RES_USEVC.
+
 	[BZ #15085]
 	* resolv/resolv.h (RES_NOCHECKNAME): Mark as unimplemented.
 	* resolv/res_debug.c (p_option): Mark RES_NOCHECKNAME as
diff --git a/NEWS b/NEWS
index c2fe8324c9f..b8332b02761 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,10 @@ Version 2.18
   10060, 10062, 10357, 11120, 11561, 12723, 13550, 13889, 13951, 13988,
   14142, 14176, 14200, 14280, 14293, 14317, 14327, 14478, 14496, 14686,
   14812, 14888, 14920, 14964, 14981, 14982, 14985, 14994, 14996, 15003,
-  15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15085,
-  15086, 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304,
-  15305, 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346,
-  15361, 15366, 15380, 15394, 15405, 15406, 15409.
+  15006, 15007, 15020, 15023, 15036, 15054, 15055, 15062, 15078, 15084,
+  15085, 15086, 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287,
+  15304, 15305, 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15342,
+  15346, 15361, 15366, 15380, 15394, 15405, 15406, 15409.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index c1d8c02603f..784343994b3 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -573,7 +573,7 @@ p_option(u_long option) {
 	case RES_INIT:		return "init";
 	case RES_DEBUG:		return "debug";
 	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
+	case RES_USEVC:		return "use-vc";
 	case RES_PRIMARY:	return "primry(unimpl)";
 	case RES_IGNTC:		return "igntc";
 	case RES_RECURSE:	return "recurs";
@@ -588,7 +588,7 @@ p_option(u_long option) {
 	case RES_NOCHECKNAME:	return "no-check-names(unimpl)";
 	case RES_KEEPTSIG:	return "keeptsig(unimpl)";
 	case RES_BLAST:		return "blast";
-	case RES_USEBSTRING:	return "ip6-bytstring";
+	case RES_USEBSTRING:	return "ip6-bytestring";
 	case RES_NOIP6DOTINT:	return "no-ip6-dotint";
 	case RES_USE_EDNS0:	return "edns0";
 	case RES_SNGLKUP:	return "single-request";