From: Evan Hunt <each@isc.org>
Date: Mon, 8 Apr 2013 17:26:50 +0000 (-0700)
Subject: [master] add request-nsid doc
X-Git-Tag: v9.10.0a1~434
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c4a453fa5c3d8b21d8982137b03e052c0d446c57;p=thirdparty%2Fbind9.git

[master] add request-nsid doc

3549.	[doc]		Documentation for "request-nsid" was missing.
			[RT #33153]
---

diff --git a/CHANGES b/CHANGES
index 869fb98810a..0e7e16adb91 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3549.	[doc]		Documentation for "request-nsid" was missing.
+			[RT #33153]
+
 3548.	[bug]		The NSID request code in resolver.c was broken
 			resulting in invalid EDNS options being sent.
 			[RT #33153]
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 7bdcc64aaa4..dcfcfb22b74 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -5316,6 +5316,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     <optional> multiple-cnames <replaceable>yes_or_no</replaceable>; </optional>
     <optional> notify <replaceable>yes_or_no</replaceable> | <replaceable>explicit</replaceable> | <replaceable>master-only</replaceable>; </optional>
     <optional> recursion <replaceable>yes_or_no</replaceable>; </optional>
+    <optional> request-nsid <replaceable>yes_or_no</replaceable>; </optional>
     <optional> rfc2308-type1 <replaceable>yes_or_no</replaceable>; </optional>
     <optional> use-id-pool <replaceable>yes_or_no</replaceable>; </optional>
     <optional> maintain-ixfr-base <replaceable>yes_or_no</replaceable>; </optional>
@@ -6739,6 +6740,22 @@ options {
               </listitem>
             </varlistentry>
 
+            <varlistentry>
+              <term><command>request-nsid</command></term>
+              <listitem>
+                <para>
+                  If <userinput>yes</userinput>, then an empty EDNS(0)
+                  NSID (Name Server Identifier) option is sent with all 
+                  queries to authoritative name servers during iterative
+                  resolution. If the authoritative server returns an NSID
+                  option in its response, then its contents are logged in
+                  the <command>resolver</command> category at level
+                  <command>info</command>.
+                  The default is <userinput>no</userinput>.
+                </para>
+              </listitem>
+            </varlistentry>
+
             <varlistentry>
               <term><command>rfc2308-type1</command></term>
               <listitem>