BIND 10 trac1452, updated. 43df0d5564a5363deaeb8e1a3b76eff3426adf4c [1452] added missing config.h (otherwise HAVE_SA_LEN wouldn't be recognized). also corrected the assignment for sun_len.

[BIND 10 source code commits]

The branch, trac1452 has been updated
       via  43df0d5564a5363deaeb8e1a3b76eff3426adf4c (commit)
       via  2b4c9db386e884ba4ef5113bb52cf0f1ada97c46 (commit)
      from  8fda3f02eafeb955b965d9cc04f5a703dbab5f02 (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 43df0d5564a5363deaeb8e1a3b76eff3426adf4c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Dec 16 14:32:01 2011 -0800

    [1452] added missing config.h (otherwise HAVE_SA_LEN wouldn't be recognized).
    also corrected the assignment for sun_len.

commit 2b4c9db386e884ba4ef5113bb52cf0f1ada97c46
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Dec 16 14:27:11 2011 -0800

    [1452] use sizeof(uint16_t) instead of a magic number '2'

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

Summary of changes:
 src/lib/util/io/socketsession.cc             |    6 ++++--
 src/lib/util/tests/socketsession_unittest.cc |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index 758a6e7..2199eb9 100644
--- a/src/lib/util/io/socketsession.cc
+++ b/src/lib/util/io/socketsession.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -50,7 +52,7 @@ using namespace internal;
 // 6 32-bit fields, and 2 sockaddr structure. (see the SocketSessionUtility
 // overview description in the header file).  sizeof sockaddr_storage
 // should be the possible max of any sockaddr structure
-const size_t DEFAULT_HEADER_BUFLEN = 2 + sizeof(uint32_t) * 6 +
+const size_t DEFAULT_HEADER_BUFLEN = sizeof(uint16_t) + sizeof(uint32_t) * 6 +
     sizeof(struct sockaddr_storage) * 2;
 
 // The allowable maximum size of data passed with the socket FD.  For now
@@ -105,7 +107,7 @@ SocketSessionForwarder::SocketSessionForwarder(const std::string& unix_file) :
     assert(impl.sock_un_.sun_path[sizeof(impl.sock_un_.sun_path) - 1] == '\0');
     impl.sock_un_len_ = 2 + unix_file.length();
 #ifdef HAVE_SA_LEN
-    impl.sock_un_.sun_len = sock_un_len_;
+    impl.sock_un_.sun_len = impl.sock_un_len_;
 #endif
     impl.fd_ = -1;
 
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index 8f0cf40..154333a 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -12,6 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>