2684. [cleanup] dig: formalize +ad and +cd as synonyms for

			+adflag and +cdflag.  [RT #19305]

diff --git a/CHANGES b/CHANGES
index 9bb222ac010c15d8df02c5895efdeb1d131453e5..bf48ca9418cf7230b89459a1f01e8e88e8a6704f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2684.  [cleanup]       dig: formalize +ad and +cd as synonyms for
+                       +adflag and +cdflag.  [RT #19305]
+
 2683.  [bug]           dnssec-signzone should clean out old NSEC3 chains when
                        the NSEC3 parameters used to sign the zone change.
                        [RT #20246]

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 56165b771e467a224ced812fbd5a6177b7b8125b..66e76e4f98080c16b70b07dac977ca8c3a8d9971 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.230 2009/09/15 03:13:43 each Exp $ */
+/* $Id: dig.c,v 1.231 2009/09/23 06:21:36 each Exp $ */
 
 /*! \file */
 
@@ -733,6 +733,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                                lookup->section_additional = state;
                                break;
                        case 'f': /* adflag */
+                       case '\0': /* +ad is a synonym for +adflag */
                                FULLCHECK("adflag");
                                lookup->adflag = state;
                                break;
@@ -787,8 +788,15 @@ plus_option(char *option, isc_boolean_t is_batchfile,
        case 'c':
                switch (cmd[1]) {
                case 'd':/* cdflag */
-                       FULLCHECK("cdflag");
-                       lookup->cdflag = state;
+                       switch (cmd[2]) {
+                       case 'f': /* cdflag */
+                       case '\0': /* +cd is a synonym for +cdflag */
+                               FULLCHECK("cdflag");
+                               lookup->cdflag = state;
+                               break;
+                       default:
+                               goto invalid_option;
+                       }
                        break;
                case 'l': /* cl */
                        FULLCHECK("cl");