From 28930ddf4fd6c1c993650ea60031148dd17e39ef Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Mon, 20 Oct 2014 01:58:10 +0000
Subject: s_client: don't call shutdown on a non-existent socket descriptor.
from Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
ok beck@, deraadt@
---
src/usr.bin/openssl/s_client.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index dba1336f76..a5f4d4c9c6 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.3 2014/10/13 02:39:09 bcook Exp $ */
+/* $OpenBSD: s_client.c,v 1.4 2014/10/20 01:58:10 bcook Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -822,8 +822,6 @@ re_start:
if (init_client(&s, host, port, socket_type, af) == 0) {
BIO_printf(bio_err, "connect:errno=%d\n", errno);
- shutdown(s, SHUT_RD);
- close(s);
goto end;
}
BIO_printf(bio_c_out, "CONNECTED(%08X)\n", s);
--
cgit v1.2.3-55-g6feb