BIND 10 master, updated. 54e8f4061f92c2f9e5b8564240937515efa6d934 [master] Merge branch 'trac2641-0'

[BIND 10 source code commits]

The branch, master has been updated
       via  54e8f4061f92c2f9e5b8564240937515efa6d934 (commit)
       via  2c05b09207ff79b66217e941e884c0b91fb7f309 (commit)
       via  d1af010b641ff25dda7aa76ec6beba1ba551467d (commit)
      from  271cb4cfda71897f041e709b07a86694350f9f90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54e8f4061f92c2f9e5b8564240937515efa6d934
Merge: 271cb4c 2c05b09
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Feb 13 09:54:39 2013 -0800

    [master] Merge branch 'trac2641-0'

-----------------------------------------------------------------------

Summary of changes:
 doc/guide/bind10-guide.xml |   13 ++++++++-----
 src/bin/cmdctl/Makefile.am |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 88c8483..ce0132a 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -420,6 +420,13 @@ var/
         </listitem>
 
         <listitem>
+          <para>Create a user for yourself:
+            <screen>$ <userinput>cd /usr/local/etc/bind10/</userinput></screen>
+            <screen>$ <userinput>/usr/local/sbin/b10-cmdctl-usermgr</userinput></screen>
+          </para>
+        </listitem>
+
+        <listitem>
           <para>Start the server (as root):
             <screen>$ <userinput>/usr/local/sbin/bind10</userinput></screen>
           </para>
@@ -431,7 +438,7 @@ var/
 	    DNS service (by using the <command>bindctl</command> utility
 	    to configure the <command>b10-auth</command> component to
 	    run): <screen>$ <userinput>bindctl</userinput></screen>
-	    (Login with the provided default username and password.)
+	    (Login with the username and password you used above to create a user.)
             <screen>
 > <userinput>config add Init/components b10-auth</userinput>
 > <userinput>config set Init/components/b10-auth/special auth</userinput>
@@ -1115,10 +1122,6 @@ but that is a single file, maybe this should go back to that format?
       <filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>.
       This comma-delimited file lists the accounts with a user name,
       hashed password, and salt.
-      (A sample file is at
-      <filename>/usr/local/share/bind10/cmdctl-accounts.csv</filename>.
-      It contains the user named <quote>root</quote> with the password
-      <quote>bind10</quote>.)
     </para>
 
     <para>
diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index ab87dd3..8cadf89 100644
--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -71,7 +71,7 @@ if INSTALL_CONFIGURATIONS
 # because these file will contain sensitive information.
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
-	for f in $(USERSFILES) $(CERTFILES) ; do	\
+	for f in $(CERTFILES) ; do	\
 	  if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then	\
 	    ${INSTALL} -m 640 $(srcdir)/$$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ;	\
 	  fi ;	\