This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.17-578-gc3ed808


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c3ed8088e4812d4f58bf9f6124106c65be22faef (commit)
      from  f1a24198af04ad3d0ebc9dffde454beb19ed0804 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c3ed8088e4812d4f58bf9f6124106c65be22faef

commit c3ed8088e4812d4f58bf9f6124106c65be22faef
Author: Andreas Jaeger <aj@suse.de>
Date:   Mon Apr 29 21:15:44 2013 +0200

    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 f4a24ff..fd81ead 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 c2fe832..b8332b0 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 c1d8c02..7843439 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";

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    4 ++++
 NEWS               |    8 ++++----
 resolv/res_debug.c |    4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]