[1452] added missing config.h (otherwise HAVE_SA_LEN wouldn't be recognized).

also corrected the assignment for sun_len.

diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index 969f8fb943c4c306cb8a7b278ee07fe8c449a5af..2199eb90464b165824e98755e2692687f2c00f4e 100644 (file)
--- 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>
@@ -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 8f0cf40e1c7589fe9da176bb9682e338817024f8..154333a0382f64ed0cf2e9b3db55951a6bdcbf6e 100644 (file)
--- 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>