From: Mark Andrews <marka@isc.org>
Date: Wed, 23 Jun 2004 04:19:41 +0000 (+0000)
Subject: 1677.   [bug]           dig: +aaonly didn't work, +aaflag undocumented.
X-Git-Tag: v9.3.0rc2~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d522299a1c94a21c8759dcc7799dbe472c503bbb;p=thirdparty%2Fbind9.git

1677.   [bug]           dig: +aaonly didn't work, +aaflag undocumented.
---

diff --git a/CHANGES b/CHANGES
index 8705250d94a..ca83090b556 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1677.	[bug]		dig: +aaonly didn't work, +aaflag undocumented.
+
 1674.	[port]		linux: increase buffer size used to scan
 			/proc/net/if_inet6.
 
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index d8756c8817d..b2c46254d92 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.157.2.13.2.19 2004/06/19 02:30:10 sra Exp $ */
+/* $Id: dig.c,v 1.157.2.13.2.20 2004/06/23 04:19:40 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -188,7 +188,7 @@ help(void) {
 "\n"
 "                 +[no]fail           (Don't try next server on SERVFAIL)\n"
 "                 +[no]besteffort     (Try to parse even illegal messages)\n"
-"                 +[no]aaonly         (Set AA flag in query)\n"
+"                 +[no]aaonly         (Set AA flag in query (+[no]aaflag))\n"
 "                 +[no]adflag         (Set AD flag in query)\n"
 "                 +[no]cdflag         (Set CD flag in query)\n"
 "                 +[no]cl             (Control display of class in records)\n"
@@ -738,8 +738,8 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 	switch (cmd[0]) {
 	case 'a':
 		switch (cmd[1]) {
-		case 'a': /* aaflag */
-			FULLCHECK("aaflag");
+		case 'a': /* aaonly / aaflag */
+			FULLCHECK2("aaonly", "aaflag");
 			lookup->aaonly = state;
 			break;
 		case 'd': 
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index d083f21f0cc..d22ae87064d 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -16,7 +16,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.4.2.7.4.8 2004/04/13 03:00:05 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.4.2.7.4.9 2004/06/23 04:19:41 marka Exp $ -->
 
 <refentry>
 
@@ -306,9 +306,12 @@ Deprecated, treated as a synonym for <parameter>+[no]search</parameter>
 
 <varlistentry><term><option>+[no]aaonly</option></term>
 <listitem><para>
-This option does nothing.  It is provided for compatibility with old
-versions of <command>dig</command> where it set an unimplemented
-resolver flag.
+Sets the "aa" flag in the query.
+</para></listitem></varlistentry>
+
+<varlistentry><term><option>+[no]aaflag</option></term>
+<listitem><para>
+A synonym for <parameter>+[no]aaonly</parameter>.
 </para></listitem></varlistentry>
 
 <varlistentry><term><option>+[no]adflag</option></term>