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
diff --git a/channels.c b/channels.c index 111a2cfa4..028d5db20 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.364 2017/05/31 00:43:04 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.365 2017/05/31 08:58:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -479,8 +479,6 @@ channel_free(Channel *c) | |||
479 | debug3("channel %d: status: %s", c->self, s); | 479 | debug3("channel %d: status: %s", c->self, s); |
480 | free(s); | 480 | free(s); |
481 | 481 | ||
482 | if (c->sock != -1) | ||
483 | shutdown(c->sock, SHUT_RDWR); | ||
484 | channel_close_fds(c); | 482 | channel_close_fds(c); |
485 | buffer_free(&c->input); | 483 | buffer_free(&c->input); |
486 | buffer_free(&c->output); | 484 | buffer_free(&c->output); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.257 2017/05/31 08:09:45 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.258 2017/05/31 08:58:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
570 | state->initialized = 0; | 570 | state->initialized = 0; |
571 | if (do_close) { | 571 | if (do_close) { |
572 | if (state->connection_in == state->connection_out) { | 572 | if (state->connection_in == state->connection_out) { |
573 | shutdown(state->connection_out, SHUT_RDWR); | ||
574 | close(state->connection_out); | 573 | close(state->connection_out); |
575 | } else { | 574 | } else { |
576 | close(state->connection_in); | 575 | close(state->connection_in); |