BIND 10 trac826, updated. c4aed3bb0910d954e8df6415a009f1ec725e8740 disable last socket requestor test which assume far too much

[BIND 10 source code commits]

The branch, trac826 has been updated
       via  c4aed3bb0910d954e8df6415a009f1ec725e8740 (commit)
      from  fefaa82dfb863499bc6b4f7705fa4d9ecfb4368d (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 c4aed3bb0910d954e8df6415a009f1ec725e8740
Author: Francis Dupont <fdupont at isc.org>
Date:   Wed Jul 4 02:04:28 2012 +0200

    disable last socket requestor test which assume far too much

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

Summary of changes:
 .../server_common/tests/socket_requestor_test.cc   |    2 ++
 src/lib/util/io/fd_share.cc                        |    1 +
 2 files changed, 3 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/server_common/tests/socket_requestor_test.cc b/src/lib/server_common/tests/socket_requestor_test.cc
index 13db1e0..bd2cd2a 100644
--- a/src/lib/server_common/tests/socket_requestor_test.cc
+++ b/src/lib/server_common/tests/socket_requestor_test.cc
@@ -638,6 +638,7 @@ DWORD WINAPI childproc(void *args) {
 }
 #endif
 
+#ifndef _WIN32
 TEST_F(SocketRequestorTest, testSocketPassing) {
     TestSocket ts;
     std::vector<DataPair> data;
@@ -736,5 +737,6 @@ TEST_F(SocketRequestorTest, testSocketPassing) {
     addAnswer("foo", ts2.getPath());
     EXPECT_THROW(doRequest(), SocketRequestor::SocketError);
 }
+#endif
 
 }
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index e70b1ca..5afb137 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -228,6 +228,7 @@ send_fd(const SOCKET sock, const SOCKET fd) {
     }
 
     WSAPROTOCOL_INFO pi;
+    // this will fail with WSAENOTSOCK when fd is not a socket
     if (WSADuplicateSocket(fd, peerpid, &pi) != 0) {
         return (FD_OTHER_ERROR);
     }