tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2012/08/17 00:45:45

Browse Source 
[clientloop.c clientloop.h mux.c]
     Force a clean shutdown of ControlMaster client sessions when the ~. escape
     sequence is used.  This means that ~. should now work in mux clients even
     if the server is no longer responding.  Found by tedu, ok djm.
This commit is contained in:
Darren Tucker 2012-09-06 21:19:05 +10:00
parent 3ee50c5d9f
commit 66cb0e0733
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,11 @@
[ssh-keygen.1] [ssh-keygen.1]
a little more info on certificate validity; a little more info on certificate validity;
requested by Ross L Richardson, and provided by djm requested by Ross L Richardson, and provided by djm
- dtucker@cvs.openbsd.org 2012/08/17 00:45:45
[clientloop.c clientloop.h mux.c]
Force a clean shutdown of ControlMaster client sessions when the ~. escape
sequence is used. This means that ~. should now work in mux clients even
if the server is no longer responding. Found by tedu, ok djm.
20120830 20120830
- (dtucker) [moduli] Import new moduli file. - (dtucker) [moduli] Import new moduli file.

4
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.240 2012/06/20 04:42:58 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.241 2012/08/17 00:45:45 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1046,6 +1046,8 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
if (c && c->ctl_chan != -1) { if (c && c->ctl_chan != -1) {
chan_read_failed(c); chan_read_failed(c);
chan_write_failed(c); chan_write_failed(c);
mux_master_session_cleanup_cb(c->self,
NULL);
return 0; return 0;
} else } else
quit_pending = 1; quit_pending = 1;

3
clientloop.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.h,v 1.29 2011/09/09 22:46:44 djm Exp $ */ /* $OpenBSD: clientloop.h,v 1.30 2012/08/17 00:45:45 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -76,4 +76,5 @@ void muxserver_listen(void);
void muxclient(const char *); void muxclient(const char *);
void mux_exit_message(Channel *, int); void mux_exit_message(Channel *, int);
void mux_tty_alloc_failed(Channel *); void mux_tty_alloc_failed(Channel *);
void mux_master_session_cleanup_cb(int, void *);

4
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.36 2012/07/06 01:37:21 djm Exp $ */ /* $OpenBSD: mux.c,v 1.37 2012/08/17 00:45:45 dtucker Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -188,7 +188,7 @@ static const struct {
/* Cleanup callback fired on closure of mux slave _session_ channel */ /* Cleanup callback fired on closure of mux slave _session_ channel */
/* ARGSUSED */ /* ARGSUSED */
static void void
mux_master_session_cleanup_cb(int cid, void *unused) mux_master_session_cleanup_cb(int cid, void *unused)
{ {
Channel *cc, *c = channel_by_id(cid); Channel *cc, *c = channel_by_id(cid);