diff options
Diffstat (limited to '')
-rw-r--r-- | src/usr.bin/openssl/s_socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c index 62b32d3936..5d90fad8bb 100644 --- a/src/usr.bin/openssl/s_socket.c +++ b/src/usr.bin/openssl/s_socket.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_socket.c,v 1.10 2018/08/19 20:07:06 tb Exp $ */ | 1 | /* $OpenBSD: s_socket.c,v 1.11 2019/06/28 13:35:02 deraadt Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -107,7 +107,7 @@ init_client(int *sock, char *host, char *port, int type, int af) | |||
107 | i = 0; | 107 | i = 0; |
108 | i = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, | 108 | i = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, |
109 | (char *) &i, sizeof(i)); | 109 | (char *) &i, sizeof(i)); |
110 | if (i < 0) { | 110 | if (i == -1) { |
111 | perror("keepalive"); | 111 | perror("keepalive"); |
112 | goto out; | 112 | goto out; |
113 | } | 113 | } |
@@ -251,10 +251,10 @@ do_accept(int acc_sock, int *sock, char **host) | |||
251 | ling.l_onoff=1; | 251 | ling.l_onoff=1; |
252 | ling.l_linger=0; | 252 | ling.l_linger=0; |
253 | i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling)); | 253 | i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling)); |
254 | if (i < 0) { perror("linger"); return(0); } | 254 | if (i == -1) { perror("linger"); return(0); } |
255 | i=0; | 255 | i=0; |
256 | i=setsockopt(ret,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i)); | 256 | i=setsockopt(ret,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i)); |
257 | if (i < 0) { perror("keepalive"); return(0); } | 257 | if (i == -1) { perror("keepalive"); return(0); } |
258 | */ | 258 | */ |
259 | 259 | ||
260 | if (host == NULL) | 260 | if (host == NULL) |