2 files changed, 2 insertions, 5 deletions

diff --git a/channels.c b/channels.c
index 111a2cfa4..028d5db20 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.364 2017/05/31 00:43:04 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.365 2017/05/31 08:58:52 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -479,8 +479,6 @@ channel_free(Channel *c)
         debug3("channel %d: status: %s", c->self, s);
         free(s);
 
-        if (c->sock != -1)
-                shutdown(c->sock, SHUT_RDWR);
         channel_close_fds(c);
         buffer_free(&c->input);
         buffer_free(&c->output);
diff --git a/packet.c b/packet.c
index 862aeb052..6ea2f4bb7 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.257 2017/05/31 08:09:45 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.258 2017/05/31 08:58:52 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -570,7 +570,6 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
         state->initialized = 0;
         if (do_close) {
                 if (state->connection_in == state->connection_out) {
-                        shutdown(state->connection_out, SHUT_RDWR);
                         close(state->connection_out);
                 } else {
                         close(state->connection_in);