From: Evan Hunt <each@isc.org>
Date: Thu, 4 Jun 2015 15:55:32 +0000 (-0700)
Subject: [master] dig option cleanups
X-Git-Tag: v9.11.0a1~747
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=eb447eca8847be14e93d7b2d524154433e4ee565;p=thirdparty%2Fbind9.git

[master] dig option cleanups

4132.	[cleanup]	dig: added +rd as a synonym for +recurse,
			added +class as an unabbreviated alternative
			to +cl. [RT #39686]
---

diff --git a/CHANGES b/CHANGES
index 64fa271f31e..d51199b117d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4132.	[cleanup]	dig: added +rd as a synonym for +recurse,
+			added +class as an unabbreviated alternative
+			to +cl. [RT #39686]
+
 4131.	[bug]		Addressed further problems with reloading RPZ
 			zones. [RT #39649]
 
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 6144bfc8881..dbf84ddc48b 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -879,8 +879,9 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 				goto invalid_option;
 			}
 			break;
-		case 'l': /* cl */
-			FULLCHECK("cl");
+		case 'l': /* class */
+			/* keep +cl for backwards compatibility */
+			FULLCHECK2("cl", "class");
 			noclass = ISC_TF(!state);
 			break;
 		case 'm': /* cmd */
@@ -1150,6 +1151,10 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 		break;
 	case 'r':
 		switch (cmd[1]) {
+		case 'd': /* rdflag */
+			FULLCHECK("rdflag");
+			lookup->recurse = state;
+			break;
 		case 'e':
 			switch (cmd[2]) {
 			case 'c': /* recurse */
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 66b21c199bb..91a179d9e43 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -436,6 +436,9 @@
       that keyword.  Other
       keywords assign values to options like the timeout interval.  They
       have the form <option>+keyword=value</option>.
+      Keywords may be abbreviated, provided the abbreviation is
+      unambiguous; for example, <literal>+cd</literal> is equivalent
+      to <literal>+cdflag</literal>.
       The query options are:
 
       <variablelist>
@@ -551,7 +554,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term><option>+[no]cl</option></term>
+	  <term><option>+[no]class</option></term>
 	  <listitem>
 	    <para>
 	      Display [do not display] the CLASS when printing the
@@ -853,6 +856,15 @@
 	  </listitem>
 	</varlistentry>
 
+	<varlistentry>
+	  <term><option>+[no]rdflag</option></term>
+	  <listitem>
+	    <para>
+	      A synonym for <parameter>+[no]recurse</parameter>.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
 	<varlistentry>
 	  <term><option>+[no]recurse</option></term>
 	  <listitem>