diff options
Diffstat (limited to 'src/usr.bin/openssl/s_socket.c')
-rw-r--r-- | src/usr.bin/openssl/s_socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c index 869211de73..d3aff1b3bb 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.8 2015/09/10 02:23:29 lteo Exp $ */ | 1 | /* $OpenBSD: s_socket.c,v 1.9 2018/02/07 05:47:55 jsing 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 | * |
@@ -122,7 +122,7 @@ init_client(int *sock, char *host, char *port, int type, int af) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | perror("connect"); | 124 | perror("connect"); |
125 | out: | 125 | out: |
126 | if (s != -1) | 126 | if (s != -1) |
127 | close(s); | 127 | close(s); |
128 | freeaddrinfo(ai_top); | 128 | freeaddrinfo(ai_top); |
@@ -210,7 +210,7 @@ init_server_long(int *sock, int port, char *ip, int type) | |||
210 | goto err; | 210 | goto err; |
211 | *sock = s; | 211 | *sock = s; |
212 | ret = 1; | 212 | ret = 1; |
213 | err: | 213 | err: |
214 | if ((ret == 0) && (s != -1)) { | 214 | if ((ret == 0) && (s != -1)) { |
215 | shutdown(s, SHUT_RD); | 215 | shutdown(s, SHUT_RD); |
216 | close(s); | 216 | close(s); |
@@ -233,7 +233,7 @@ do_accept(int acc_sock, int *sock, char **host) | |||
233 | socklen_t len; | 233 | socklen_t len; |
234 | /* struct linger ling; */ | 234 | /* struct linger ling; */ |
235 | 235 | ||
236 | redoit: | 236 | redoit: |
237 | 237 | ||
238 | memset((char *) &from, 0, sizeof(from)); | 238 | memset((char *) &from, 0, sizeof(from)); |
239 | len = sizeof(from); | 239 | len = sizeof(from); |
@@ -285,7 +285,7 @@ redoit: | |||
285 | } | 285 | } |
286 | } | 286 | } |
287 | 287 | ||
288 | end: | 288 | end: |
289 | *sock = ret; | 289 | *sock = ret; |
290 | return (1); | 290 | return (1); |
291 | } | 291 | } |