summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2017-05-31 08:58:52 +0000
committerDamien Miller <djm@mindrot.org>2017-06-01 14:54:46 +1000
commitdc5dc45662773c0f7745c29cf77ae2d52723e55e (patch)
treeddfdb671cf5a524d82d82bfe01eadeca4a6459de /packet.c
parent1e0cdf8efb745d0d1116e1aa22bdc99ee731695e (diff)
upstream commit
These shutdown() SHUT_RDWR are not needed before close() ok djm markus claudio Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/packet.c b/packet.c
index 862aeb052..6ea2f4bb7 100644
--- a/packet.c
+++ b/packet.c
@@ -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);