[openssh-commits] [openssh] 03/09: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit dc5dc45662773c0f7745c29cf77ae2d52723e55e
Author: deraadt at openbsd.org <deraadt at openbsd.org>
Date:   Wed May 31 08:58:52 2017 +0000

    upstream commit
    
    These shutdown() SHUT_RDWR are not needed before close()
    ok djm markus claudio
    
    Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
---
 channels.c | 4 +---
 packet.c   | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/channels.c b/channels.c
index 111a2cfa..028d5db2 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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 862aeb05..6ea2f4bb 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.