tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

These shutdown() SHUT_RDWR are not needed before close()
ok djm markus claudio

Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
This commit is contained in:
deraadt@openbsd.org 2017-05-31 08:58:52 +00:00 committed by Damien Miller
parent 1e0cdf8efb
commit dc5dc45662
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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); debug3("channel %d: status: %s", c->self, s);
free(s); free(s);
if (c->sock != -1)
shutdown(c->sock, SHUT_RDWR);
channel_close_fds(c); channel_close_fds(c);
buffer_free(&c->input); buffer_free(&c->input);
buffer_free(&c->output); buffer_free(&c->output);

3
packet.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; state->initialized = 0;
if (do_close) { if (do_close) {
if (state->connection_in == state->connection_out) { if (state->connection_in == state->connection_out) {
shutdown(state->connection_out, SHUT_RDWR);
close(state->connection_out); close(state->connection_out);
} else { } else {
close(state->connection_in); close(state->connection_in);