diff options
author | 2000-05-01 20:21:40 +0000 | |
---|---|---|
committer | 2000-05-01 20:21:40 +0000 | |
commit | 61d2537c919107a73693c27a0b578f992edd1f80 (patch) | |
tree | 3316f2f6437cd32bab9f56561b0c8943c338ad73 | |
parent | Remove trailing '/' in exports pathnames so mount requests will match (diff) | |
download | wireguard-openbsd-61d2537c919107a73693c27a0b578f992edd1f80.tar.xz wireguard-openbsd-61d2537c919107a73693c27a0b578f992edd1f80.zip |
unbreak, ok niels@
-rw-r--r-- | usr.bin/ssh/channels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 42a8a04552d..a064b6b0b35 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$Id: channels.c,v 1.53 2000/05/01 19:11:35 markus Exp $"); +RCSID("$Id: channels.c,v 1.54 2000/05/01 20:21:40 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -250,7 +250,6 @@ void channel_close_fds(Channel *c) { if (c->sock != -1) { - shutdown(c->sock, SHUT_RDWR); close(c->sock); c->sock = -1; } @@ -281,6 +280,8 @@ channel_free(int id) debug("channel_free: channel %d: dettaching channel user", id); c->dettach_user(c->self, NULL); } + if (c->sock != -1) + shutdown(c->sock, SHUT_RDWR); channel_close_fds(c); buffer_free(&c->input); buffer_free(&c->output); |