From: Evan Hunt <each@isc.org>
Date: Sat, 9 Sep 2017 01:22:12 +0000 (-0700)
Subject: [master] fix tag
X-Git-Tag: v9.12.0a1~30
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bcb7c7fdad2099f186822ec64edc3263cff8071c;p=thirdparty%2Fbind9.git

[master] fix tag
---

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 2d13374455c..6826845d84e 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -892,11 +892,14 @@ plus_option(const char *option, isc_boolean_t is_batchfile,
 			break;
 		case 'n': /* dnssec */
 			FULLCHECK("dnssec");
+ dnssec:
 			if (state && lookup->edns == -1)
 				lookup->edns = 0;
 			lookup->dnssec = state;
 			break;
-		case 'o': /* domain */
+		case 'o': /* domain ... but treat "do" as synonym for dnssec */
+			if (cmd[2] == '\0')
+				goto dnssec;
 			FULLCHECK("domain");
 			if (value == NULL)
 				goto need_value;
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 97491873a46..308e5a174c2 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -444,7 +444,7 @@
     <itemizedlist>
       <listitem>
 	<para>
-	  The lightweight resolver daemon and library (<comand>lwresd</command>
+	  The lightweight resolver daemon and library (<command>lwresd</command>
 	  and <command>liblwres</command>) have been removed. [RT #45186]
 	</para>
       </listitem>