rpcrt4: Disable TCP/IP connection support if we don't have socketpair.

diff --git a/configure b/configure
index 2cc3711d23d92ea83709f47c49fa3dd376df2a6f..ab27b58bc8c60d037a85275b6af79fb750a4ece2 100755 (executable)
--- a/configure
+++ b/configure
@@ -17791,6 +17791,7 @@ esac
 
 
 
+
 
 
 for ac_func in \
@@ -17848,6 +17849,7 @@ for ac_func in \
        sigaltstack \
        sigprocmask \
        snprintf \
+       socketpair \
        spawnvp \
        statfs \
        statvfs \

diff --git a/configure.ac b/configure.ac
index 8ace1cb2f0a2b11cfc7ada0d345b0657918d26ad..be295a4fd6e2ee3e4fbe15acef38f4902da56ed7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1410,6 +1410,7 @@ AC_CHECK_FUNCS(\
        sigaltstack \
        sigprocmask \
        snprintf \
+       socketpair \
        spawnvp \
        statfs \
        statvfs \

diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c
index 815ed64c19e04dcf69e3f2dae188cbc462320462..d635d499b4b8e5d61d82206420aa6527ad6c9b97 100644 (file)
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -732,6 +732,8 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d
 
 /**** ncacn_ip_tcp support ****/
 
+#ifdef HAVE_SOCKETPAIR
+
 typedef struct _RpcConnection_tcp
 {
   RpcConnection common;
@@ -1372,6 +1374,8 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq
     return 1;
 }
 
+#endif  /* HAVE_SOCKETPAIR */
+
 static const struct connection_ops conn_protseq_list[] = {
   { "ncacn_np",
     { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB },
@@ -1399,6 +1403,7 @@ static const struct connection_ops conn_protseq_list[] = {
     rpcrt4_ncalrpc_get_top_of_tower,
     rpcrt4_ncalrpc_parse_top_of_tower,
   },
+#ifdef HAVE_SOCKETPAIR
   { "ncacn_ip_tcp",
     { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP },
     rpcrt4_conn_tcp_alloc,
@@ -1412,6 +1417,7 @@ static const struct connection_ops conn_protseq_list[] = {
     rpcrt4_ncacn_ip_tcp_get_top_of_tower,
     rpcrt4_ncacn_ip_tcp_parse_top_of_tower,
   }
+#endif
 };
 
 
@@ -1435,6 +1441,7 @@ static const struct protseq_ops protseq_list[] =
         rpcrt4_protseq_np_wait_for_new_connection,
         rpcrt4_protseq_ncalrpc_open_endpoint,
     },
+#ifdef HAVE_SOCKETPAIR
     {
         "ncacn_ip_tcp",
         rpcrt4_protseq_sock_alloc,
@@ -1444,6 +1451,7 @@ static const struct protseq_ops protseq_list[] =
         rpcrt4_protseq_sock_wait_for_new_connection,
         rpcrt4_protseq_ncacn_ip_tcp_open_endpoint,
     },
+#endif
 };
 
 #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0]))

diff --git a/include/config.h.in b/include/config.h.in
index 1753e41dfa3f58951fc2119a01c405edb87d9c5b..7f3b88835844380d7b9d715b2f876eb33f22b274 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -663,6 +663,9 @@
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
+/* Define to 1 if you have the `socketpair' function. */
+#undef HAVE_SOCKETPAIR
+
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H