From: Evan Hunt <each@isc.org>
Date: Fri, 18 Apr 2014 22:05:52 +0000 (-0700)
Subject: [master] clarify nsupdate -y
X-Git-Tag: v9.11.0a1~1741
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1f73b46904d266abe57814ea512dc7069e7a1e73;p=thirdparty%2Fbind9.git

[master] clarify nsupdate -y

3815.   [doc]           Clarify "nsupdate -y" usage in man page. [RT #35808]
---

diff --git a/CHANGES b/CHANGES
index a6d8b56ddd6..4ba6f17440f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3815.	[doc]		Clarify "nsupdate -y" usage in man page. [RT #35808]
+
 3814.	[func]		The "masterfile-style" zone option controls the
 			formatting of dumped zone files. Options are
 			"relative" (multiline format) and "full" (one
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index a2156beb9ac..323d5132a92 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -20,7 +20,7 @@
 
 <refentry id="man.nsupdate">
   <refentryinfo>
-    <date>March 10, 2012</date>
+    <date>April 18, 2014</date>
   </refentryinfo>
   <refmeta>
     <refentrytitle><application>nsupdate</application></refentrytitle>
@@ -161,7 +161,13 @@
       <optional><parameter>hmac:</parameter></optional><parameter>keyname:secret.</parameter>
       <parameter>keyname</parameter> is the name of the key, and
       <parameter>secret</parameter> is the base64 encoded shared secret.
-      Use of the <option>-y</option> option is discouraged because the
+      <parameter>hmac</parameter> is the name of the key algorithm;
+      valid choices are <literal>hmac-md5</literal>,
+      <literal>hmac-sha1</literal>, <literal>hmac-sha224</literal>,
+      <literal>hmac-sha256</literal>, <literal>hmac-sha384</literal>, or
+      <literal>hmac-sha512</literal>.  If <parameter>hmac</parameter>
+      is not specified, the default is <literal>hmac-md5</literal>.
+      NOTE: Use of the <option>-y</option> option is discouraged because the
       shared secret is supplied as a command line argument in clear text.
       This may be visible in the output from
       <citerefentry>