BIND 10 master, updated. c6385a4f54979296a9eb50da73d9fccddff81ff6 [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  c6385a4f54979296a9eb50da73d9fccddff81ff6 (commit)
       via  bed40730d9387775ad655427420157d6d18b33b1 (commit)
       via  6276f4098c51d0f8b8703aa3a6cbf56f07264959 (commit)
       via  18bcce8781a3b410b0d6f8712495da27a28b9fc5 (commit)
      from  83d31781cfeb717a84e916b1a08522664dd7b590 (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 c6385a4f54979296a9eb50da73d9fccddff81ff6
Merge: bed4073 83d3178
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Jun 28 09:05:24 2012 -0500

    [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit bed40730d9387775ad655427420157d6d18b33b1
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Jun 28 09:04:28 2012 -0500

    [master] change INFO to ERROR for CMDCTL_SSL_SETUP_FAILURE_USER_DENIED logging
    
    okayed via jabber

commit 6276f4098c51d0f8b8703aa3a6cbf56f07264959
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jun 27 12:26:05 2012 -0500

    [master] very minor doc cleanup

commit 18bcce8781a3b410b0d6f8712495da27a28b9fc5
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jun 27 11:20:49 2012 -0500

    [master] update required software docs
    
    See ticket #2076.
    change Debian 5 to 6
    cross-reference to build dependencies.
    Move a paragraph and slight rewording.

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

Summary of changes:
 doc/guide/bind10-guide.xml  |   31 ++++++++++++++-----------------
 src/bin/cmdctl/cmdctl.py.in |    2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 5689b9a..c2e5186 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -92,7 +92,7 @@
       <title>Supported Platforms</title>
       <para>
   BIND 10 builds have been tested on (in no particular order)
-  Debian GNU/Linux 5 and unstable, Ubuntu 9.10, NetBSD 5,
+  Debian GNU/Linux 6 and unstable, Ubuntu 9.10, NetBSD 5,
   Solaris 10 and 11, FreeBSD 7 and 8, CentOS Linux 5.3,
   MacOS 10.6 and 10.7, and OpenBSD 5.1.
 
@@ -105,7 +105,17 @@
     </section>
 
     <section id="required-software">
-      <title>Required Software</title>
+      <title>Required Software at Run-time</title>
+
+      <para>
+        Running BIND 10 uses various extra software which may
+        not be provided in some operating systems' default
+        installations nor standard packages collections. You may
+        need to install this required software separately.
+        (For the build requirements, also see
+        <xref linkend="build-requirements"/>.)
+      </para>
+
       <para>
         BIND 10 requires at least Python 3.1
         (<ulink url="http://www.python.org/"/>).
@@ -140,15 +150,6 @@
         Python modules need to be built for the corresponding Python 3.
       </para>
 <!-- TODO: this will change ... -->
-
-      <note>
-        <para>
-          Some operating systems do not provide these dependencies
-          in their default installation nor standard packages
-          collections.
-          You may need to install them separately.
-        </para>
-      </note>
     </section>
 
     <section id="starting_stopping">
@@ -1058,9 +1059,6 @@ address, but the usual ones don't." mean? -->
         specifications and all current settings to the
         <command>bindctl</command> client (via
         <command>b10-cmdctl</command>).
-      </para>
-
-      <para>
         <command>b10-cfgmgr</command> relays configurations received
         from <command>b10-cmdctl</command> to the appropriate modules.
       </para>
@@ -1079,7 +1077,7 @@ config changes are actually commands to cfgmgr
       <para>
         The stored configuration file is at
         <filename>/usr/local/var/bind10-devel/b10-config.db</filename>.
-        (The full path is what was defined at build configure time for
+        (The directory is what was defined at build configure time for
         <option>--localstatedir</option>.
         The default is <filename>/usr/local/var/</filename>.)
         The format is loosely based on JSON and is directly parseable
@@ -1197,7 +1195,7 @@ but you might wanna check with likun
 
 <!-- TODO
 openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes
-but that is a single file, maybethis should go back to that format?
+but that is a single file, maybe this should go back to that format?
 -->
 
 <!--
@@ -1264,7 +1262,6 @@ shutdown
 <!--
 TODO
 (12:21:30) jinmei: I'd like to have sample session using a command line www client such as wget
-(12:21:33) jinmei: btw
 -->
 
   </chapter>
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index 74fc364..4076f4c 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -541,7 +541,7 @@ class SecureHTTPServer(socketserver_mixin.NoPollMixIn,
                                       ssl_version = ssl.PROTOCOL_SSLv23)
             return ssl_sock
         except (ssl.SSLError, CmdctlException) as err :
-            logger.info(CMDCTL_SSL_SETUP_FAILURE_USER_DENIED, err)
+            logger.error(CMDCTL_SSL_SETUP_FAILURE_USER_DENIED, err)
             self.close_request(sock)
             # raise socket error to finish the request
             raise socket.error