BZ#15086: Fix res_debug printing of options

	[BZ# 15086]
	* resolv/res_debug.c (p_option): Handle RES_NOALIASES,
	RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
	RES_SNGLKUPREOP.

diff --git a/ChangeLog b/ChangeLog
index 29e3c255249853f37db7e8c2106c1a68ae440634..bf4500a31f07384198b7f5ce98e16ac9d17b3fbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-29  Andreas Jaeger  <aj@suse.de>
+
+       [BZ# 15086]
+       * resolv/res_debug.c (p_option): Handle RES_NOALIASES,
+       RES_KEEPTSIG, RES_BLAST, RES_NOIP6DOTINT, RES_SNGLKUP,
+       RES_SNGLKUPREOP.
+
 2013-04-29  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/powerpc/fpu/libm-test-ulps: Update.

diff --git a/NEWS b/NEWS
index cdc0f3cbae0bb4e00ec05a47e4f92276dcf4af9b..0a8e622df596503c723a41050ba4b1f8b8c9bea1 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, 15160,
-  15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307,
-  15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346, 15361, 15366,
-  15394, 15405, 15406, 15409.
+  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, 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 3daa44e273db5a41fa57ea12c708ac3da9c758e8..c064d0ca48ba15ef6d81461dd5c5b13ecec35582 100644 (file)
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -582,11 +582,17 @@ p_option(u_long option) {
        case RES_DNSRCH:        return "dnsrch";
        case RES_INSECURE1:     return "insecure1";
        case RES_INSECURE2:     return "insecure2";
+       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_KEEPTSIG:      return "keeptsig(unimpl)";
+       case RES_BLAST:         return "blast";
        case RES_USEBSTRING:    return "ip6-bytstring";
+       case RES_NOIP6DOTINT:   return "no-ip6-dotint";
        case RES_USE_EDNS0:     return "edns0";
+       case RES_SNGLKUP:       return "single-request";
+       case RES_SNGLKUPREOP:   return "single-request-reopen";
        case RES_USE_DNSSEC:    return "dnssec";
        case RES_NOTLDQUERY:    return "no-tld-query";
                                /* XXX nonreentrant */