BIND 10 master, updated. 1bf6cdf0b6217de0bfd33116881d8ca252617d13 Merge branch 'trac2017'

[BIND 10 source code commits]

The branch, master has been updated
       via  1bf6cdf0b6217de0bfd33116881d8ca252617d13 (commit)
       via  e0d617df81281066d044c4137beeb3e32921c0d5 (commit)
      from  0fd36bf98ca106464ef9de56aadc2d6388cb4c83 (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 1bf6cdf0b6217de0bfd33116881d8ca252617d13
Merge: 0fd36bf e0d617d
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Jun 1 21:03:19 2012 +0200

    Merge branch 'trac2017'

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

Summary of changes:
 src/bin/auth/auth_srv.cc              |    3 ++-
 src/lib/dns/rdata/any_255/tsig_250.cc |   25 ++++++++++++++-----------
 src/lib/dns/rdata/in_1/srv_33.cc      |    8 ++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 2a92319..2a47c38 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -390,7 +390,8 @@ private:
     AuthSrv* server_;
 };
 
-AuthSrv::AuthSrv(const bool use_cache, isc::xfr::AbstractXfroutClient& xfrout_client,
+AuthSrv::AuthSrv(const bool use_cache,
+                 isc::xfr::AbstractXfroutClient& xfrout_client,
                  isc::util::io::BaseSocketSessionForwarder& ddns_forwarder)
 {
     impl_ = new AuthSrvImpl(use_cache, xfrout_client, ddns_forwarder);
diff --git a/src/lib/dns/rdata/any_255/tsig_250.cc b/src/lib/dns/rdata/any_255/tsig_250.cc
index 6115d2d..9ef887f 100644
--- a/src/lib/dns/rdata/any_255/tsig_250.cc
+++ b/src/lib/dns/rdata/any_255/tsig_250.cc
@@ -76,19 +76,22 @@ struct TSIG::TSIGImpl {
 /// where
 /// - <Alg> is a valid textual representation of domain name.
 /// - <Time> is an unsigned 48-bit decimal integer.
-/// - <MACSize>, <OrigID>, and <OtherLen> are an unsigned 16-bit decimal
+/// - <MACSize>, <OrigID>, and <OtherLen> are an unsigned
+///   16-bit decimal
 ///   integer.
-/// - <Error> is an unsigned 16-bit decimal integer or a valid mnemonic for
-///   the Error field specified in RFC2845.  Currently, "BADSIG", "BADKEY",
+/// - <Error> is an unsigned 16-bit decimal integer or a valid mnemonic
+///   for the Error field specified in RFC2845.  Currently, "BADSIG", "BADKEY",
 ///   and "BADTIME" are supported (case sensitive).  In future versions
 ///   other representations that are compatible with the DNS RCODE will be
 ///   supported.
-/// - <MAC> and <OtherData> is a BASE-64 encoded string that does not contain
-///   space characters.
-///   When <MACSize> and <OtherLen> is 0, <MAC> and <OtherData> must not
-///   appear in \c tsgi_str, respectively.
-/// - The decoded data of <MAC> is <MACSize> bytes of binary stream.
-/// - The decoded data of <OtherData> is <OtherLen> bytes of binary stream.
+/// - <MAC> and <OtherData> is a BASE-64 encoded string that does
+///   not contain space characters.
+///   When <MACSize> and <OtherLen> is 0, <MAC> and
+///   <OtherData> must not appear in \c tsig_str, respectively.
+/// - The decoded data of <MAC> is <MACSize> bytes of binary
+///   stream.
+/// - The decoded data of <OtherData> is <OtherLen> bytes of
+///   binary stream.
 ///
 /// An example of valid string is:
 /// \code "hmac-sha256. 853804800 300 3 AAAA 2845 0 0" \endcode
@@ -103,8 +106,8 @@ struct TSIG::TSIGImpl {
 ///
 /// If <Alg> is not a valid domain name, a corresponding exception from
 /// the \c Name class will be thrown;
-/// if <MAC> or <OtherData> is not validly encoded in BASE-64, an exception
-/// of class \c isc::BadValue will be thrown;
+/// if <MAC> or <OtherData> is not validly encoded in BASE-64, an
+/// exception of class \c isc::BadValue will be thrown;
 /// if %any of the other bullet points above is not met, an exception of
 /// class \c InvalidRdataText will be thrown.
 /// This constructor internally involves resource allocation, and if it fails
diff --git a/src/lib/dns/rdata/in_1/srv_33.cc b/src/lib/dns/rdata/in_1/srv_33.cc
index 849263f..a1a3909 100644
--- a/src/lib/dns/rdata/in_1/srv_33.cc
+++ b/src/lib/dns/rdata/in_1/srv_33.cc
@@ -52,8 +52,8 @@ struct SRVImpl {
 /// \code <Priority> <Weight> <Port> <Target>
 /// \endcode
 /// where
-/// - <Priority>, <Weight>, and <Port> are an unsigned 16-bit decimal
-///   integer.
+/// - <Priority>, <Weight>, and <Port> are an unsigned
+///   16-bit decimal integer.
 /// - <Target> is a valid textual representation of domain name.
 ///
 /// An example of valid string is:
@@ -61,8 +61,8 @@ struct SRVImpl {
 ///
 /// <b>Exceptions</b>
 ///
-/// If <Target> is not a valid domain name, a corresponding exception from
-/// the \c Name class will be thrown;
+/// If <Target> is not a valid domain name, a corresponding exception
+/// from the \c Name class will be thrown;
 /// if %any of the other bullet points above is not met, an exception of
 /// class \c InvalidRdataText will be thrown.
 /// This constructor internally involves resource allocation, and if it fails