X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fstream.c;fp=common-src%2Fstream.c;h=22b9b0c33fe7fcdebc26afb2d89acc926061e1de;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=d9504fcdf4771236d10e50cbc20bfa1f344ede63;hpb=fb2bd066c2f8b34addafe48d62550e3033a59431;p=debian%2Famanda

diff --git a/common-src/stream.c b/common-src/stream.c
index d9504fc..22b9b0c 100644
--- a/common-src/stream.c
+++ b/common-src/stream.c
@@ -69,11 +69,13 @@ stream_server(
     } else {
 	socket_family = family;
     }
+    g_debug("stream_server opening socket with family %d (requested family was %d)", socket_family, family);
     server_socket = socket(socket_family, SOCK_STREAM, 0);
-    
+
 #ifdef WORKING_IPV6
     /* if that address family actually isn't supported, just try AF_INET */
     if (server_socket == -1 && errno == EAFNOSUPPORT) {
+	g_debug("stream_server retrying socket with AF_INET");
 	socket_family = AF_INET;
 	server_socket = socket(AF_INET, SOCK_STREAM, 0);
     }
@@ -202,10 +204,10 @@ stream_client_internal(
     int priv)
 {
     sockaddr_union svaddr, claddr;
-    int save_errno;
+    int save_errno = 0;
     char *f;
-    int client_socket;
-    int *portrange;
+    int client_socket = 0;
+    int *portrange = NULL;
     int result;
     struct addrinfo *res, *res_addr;
 
@@ -347,7 +349,7 @@ stream_accept(
 			        _("stream_accept: timeout after %d seconds\n"),
 			       timeout),
 			 timeout);
-		errno = ENOENT;			/* ??? */
+		errno = ETIMEDOUT;
 		return -1;
 	    } else if (!FD_ISSET(server_socket, &readset)) {
 		int i;