From: Ulf Möller <ulf@openssl.org>
Date: Mon, 1 May 2006 18:49:26 +0000 (+0000)
Subject: Bug fix.
X-Git-Tag: OpenSSL_0_9_8k^2~1353
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=36e77b1059ed7ba6c1852de2b1e63ffc48150d66;p=oweals%2Fopenssl.git

Bug fix.

PR: 1307
Submitted by: Oliver Tappe <zooey@hirschkaefer.de>
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index d9321a0982..37e6cdc555 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -264,7 +264,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 			
 	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 
-#ifndef OPENSSL_SYS_MPE
+#if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
 	if (type == SOCK_STREAM)
 		{
 		i=0;
@@ -274,7 +274,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 #endif
 
 	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-		{ close(s); perror("connect"); return(0); }
+		{ closesocket(s); perror("connect"); return(0); }
 	*sock=s;
 	return(1);
 	}