Guard AF_UNIX paths with HAVE_AFUNIX_H

Author: bilby91

contrib/win32/openssh/config.h.vs

@@ -1526,6 +1526,9 @@
 /* Use PIPES instead of a socketpair() */
 #define USE_PIPES 1
 
+/* define 1 if afunix.h is available */
+#define HAVE_AFUNIX_H 1
+
 /* Define if you want to sanitize fds */
 /* #undef USE_SANITISE_STDFD */
 

contrib/win32/win32compat/socketio.c

@@ -29,7 +29,9 @@
 */
 
 #include <winsock2.h>
+#ifdef HAVE_AFUNIX_H
 #include <afunix.h>
+#endif
 #include <ws2tcpip.h>
 #include <mswsock.h>
 #include <errno.h>
@@ -119,7 +121,12 @@ socketio_acceptEx(struct w32_io* pio)
 	}
 
 	/* create accepting socket */
+	#ifdef HAVE_AFUNIX_H
 	context->accept_socket = socket(addr.ss_family, SOCK_STREAM, IPPROTO_IP);
+	#else
+	context->accept_socket = socket(addr.ss_family, SOCK_STREAM, IPPROTO_TCP);
+	#endif
+
 	if (context->accept_socket == INVALID_SOCKET) {
 		errno = errno_from_WSALastError();
 		debug3("acceptEx - socket() ERROR:%d, io:%p", WSAGetLastError(), pio);
@@ -757,7 +764,10 @@ socketio_accept(struct w32_io* pio, struct sockaddr* addr, int* addrlen)
 int
 socketio_connectex(struct w32_io* pio, const struct sockaddr* name, int namelen)
 {
+	#ifdef HAVE_AFUNIX_H
 	struct sockaddr_un tmp_unix;
+	#endif
+
 	struct sockaddr_in tmp_addr4;
 	struct sockaddr_in6 tmp_addr6;
 	SOCKADDR* tmp_addr;
@@ -779,11 +789,13 @@ socketio_connectex(struct w32_io* pio, const struct sockaddr* name, int namelen)
 		tmp_addr4.sin_port = 0;
 		tmp_addr = (SOCKADDR*)&tmp_addr4;
 		tmp_addr_len = sizeof(tmp_addr4);
+	#ifdef HAVE_AFUNIX_H
 	} else if (name->sa_family == AF_UNIX) {
 		ZeroMemory(&tmp_unix, sizeof(tmp_unix));
 		tmp_unix.sun_family = AF_UNIX;
 		tmp_addr = (SOCKADDR*)&tmp_unix;
 		tmp_addr_len = sizeof(tmp_unix);
+	#endif
 	} else {
 		errno = ENOTSUP;
 		debug3("connectex - ERROR: unsuppored address family:%d, io:%p", name->sa_family, pio);

contrib/win32/win32compat/w32fd.c

@@ -298,12 +298,25 @@ w32_socket(int domain, int type, int protocol)
 	errno = 0;
 	if (min_index == -1)
 		return -1;
-	
+
+	#ifdef HAVE_AFUNIX_H
 	pio = socketio_socket(domain, type, protocol);
 	if (pio == NULL)
 		return -1;
 	pio->type = SOCK_FD;
-
+	#else
+	if (domain == AF_UNIX && type == SOCK_STREAM) {
+		pio = fileio_afunix_socket();
+		if (pio == NULL)
+			return -1;
+		pio->type = NONSOCK_FD;
+	} else {
+		pio = socketio_socket(domain, type, protocol);
+		if (pio == NULL)
+			return -1;
+		pio->type = SOCK_FD;
+	}
+	#endif
 
 	fd_table_set(pio, min_index);
 	debug4("socket:%d, socktype:%d, io:%p, fd:%d ", pio->sock, type, pio, min_index);