diff options
| author |   dtucker <dtucker@openbsd.org> | 2013-06-02 23:36:29 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2013-06-02 23:36:29 +0000 |
| commit | e5245add5ea5b458ab01fd7f1748b2074610c9f2 (patch) | |
| tree | ce77bd17c76d9ded95feec82d783d2bd8181fe86 | |
| parent | increase heat in the hackathon room by making sure everybody has to recompile (diff) | |
| download | wireguard-openbsd-e5245add5ea5b458ab01fd7f1748b2074610c9f2.tar.xz wireguard-openbsd-e5245add5ea5b458ab01fd7f1748b2074610c9f2.zip | |
No need for the mux cleanup callback to be visible so restore it to static
and call it through the detach_user function pointer. ok djm@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/clientloop.h | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/mux.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 84690cea6d8..cffb2fe81a0 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.251 2013/06/01 13:15:51 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.252 2013/06/02 23:36:29 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1100,8 +1100,8 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr, if (c && c->ctl_chan != -1) { chan_read_failed(c); chan_write_failed(c); - mux_master_session_cleanup_cb(c->self, - NULL); + if (c->detach_user) + c->detach_user(c->self, NULL); return 0; } else quit_pending = 1; diff --git a/usr.bin/ssh/clientloop.h b/usr.bin/ssh/clientloop.h index d2baa032457..338d45186f8 100644 --- a/usr.bin/ssh/clientloop.h +++ b/usr.bin/ssh/clientloop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.h,v 1.30 2012/08/17 00:45:45 dtucker Exp $ */ +/* $OpenBSD: clientloop.h,v 1.31 2013/06/02 23:36:29 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -76,5 +76,4 @@ void muxserver_listen(void); void muxclient(const char *); void mux_exit_message(Channel *, int); void mux_tty_alloc_failed(Channel *); -void mux_master_session_cleanup_cb(int, void *); diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index fcfb301d6e5..bcaa4fdd790 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.41 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.42 2013/06/02 23:36:29 dtucker Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -171,7 +171,7 @@ static const struct { /* Cleanup callback fired on closure of mux slave _session_ channel */ /* ARGSUSED */ -void +static void mux_master_session_cleanup_cb(int cid, void *unused) { Channel *cc, *c = channel_by_id(cid); |