summaryrefslogtreecommitdiff
path: root/channels.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 /channels.c
parent1e0cdf8efb745d0d1116e1aa22bdc99ee731695e (diff)
upstream commit
These shutdown() SHUT_RDWR are not needed before close() ok djm markus claudio Upstream-ID: 36f13ae4ba10f5618cb9347933101eb4a98dbcb5
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c4
1 files changed, 1 insertions, 3 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);