diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2017-05-31 08:58:52 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-06-01 14:54:46 +1000 |
| commit | dc5dc45662773c0f7745c29cf77ae2d52723e55e (patch) | |
| tree | ddfdb671cf5a524d82d82bfe01eadeca4a6459de | |
| parent | 1e0cdf8efb745d0d1116e1aa22bdc99ee731695e (diff) | |
upstream commit
These shutdown() SHUT_RDWR are not needed before close()
ok djm markus claudio
Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
| -rw-r--r-- | channels.c | 4 | ||||
| -rw-r--r-- | packet.c | 3 |
2 files changed, 2 insertions, 5 deletions
@@ -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); @@ -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); |