BZ#15085: Fix comments/strings for RES_NOCHECKNAME

	[BZ #15085]
	* resolv/resolv.h (RES_NOCHECKNAME): Mark as unimplemented.
	* resolv/res_debug.c (p_option): Mark RES_NOCHECKNAME as
	unimplemented.

diff --git a/ChangeLog b/ChangeLog
index ad58947f4651140dc73d9a795e0a885f46343c02..f4a24ff2b29f002cc631ed444fcafa1311610cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
 2013-04-29  Andreas Jaeger  <aj@suse.de>
 
+       [BZ #15085]
+       * resolv/resolv.h (RES_NOCHECKNAME): Mark as unimplemented.
+       * resolv/res_debug.c (p_option): Mark RES_NOCHECKNAME as
+       unimplemented.
+
        [BZ #15380]
        * stdlib/random.c (__initstate): Return NULL if
        __initstate fails.
 
-       [BZ# 15086]
+       [BZ #15086]
        * resolv/res_debug.c (p_option): Handle RES_NOALIASES,
        RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
        RES_SNGLKUPREOP.

diff --git a/NEWS b/NEWS
index e0d3d746ef83c1f122897579386fcf8fd0cf95c0..c2fe8324c9fd2342cef7e1763908e299cf968ea7 100644 (file)
--- 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, 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, 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 c064d0ca48ba15ef6d81461dd5c5b13ecec35582..c1d8c02603f19b79b2c61c80858b021d9e64b5b2 100644 (file)
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -585,7 +585,7 @@ p_option(u_long option) {
        case RES_NOALIASES:     return "noaliases";
        case RES_USE_INET6:     return "inet6";
        case RES_ROTATE:        return "rotate";
-       case RES_NOCHECKNAME:   return "no-check-names";
+       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";

diff --git a/resolv/resolv.h b/resolv/resolv.h
index ed15a702bf3bb9e8c084535fc98711eeee2ec1c8..53c3bba182be49ba0a2372ffba7920c016029ecd 100644 (file)
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -207,7 +207,7 @@ struct res_sym {
 #define        RES_NOALIASES   0x00001000      /* shuts off HOSTALIASES feature */
 #define        RES_USE_INET6   0x00002000      /* use/map IPv6 in gethostbyname() */
 #define RES_ROTATE     0x00004000      /* rotate ns list after each query */
-#define        RES_NOCHECKNAME 0x00008000      /* do not check names for sanity. */
+#define        RES_NOCHECKNAME 0x00008000      /* do not check names for sanity (!IMPL) */
 #define        RES_KEEPTSIG    0x00010000      /* do not strip TSIG records */
 #define        RES_BLAST       0x00020000      /* blast all recursive servers */
 #define RES_USEBSTRING 0x00040000      /* IPv6 reverse lookup with byte