- 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.

4 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b6803b6a..bdaaa0ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
      [ssh-keygen.1]
      a little more info on certificate validity;
      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
  - (dtucker) [moduli] Import new moduli file.
diff --git a/clientloop.c b/clientloop.c
index 1c1a77088..65664cbcd 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -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>
  * 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) {
                                         chan_read_failed(c);
                                         chan_write_failed(c);
+                                        mux_master_session_cleanup_cb(c->self,
+                                            NULL);
                                         return 0;
                                 } else
                                         quit_pending = 1;
diff --git a/clientloop.h b/clientloop.h
index 3bb794879..d2baa0324 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -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>
@@ -76,4 +76,5 @@ 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/mux.c b/mux.c
index 5e0e65ff3..0f1532bb5 100644
--- a/mux.c
+++ b/mux.c
@@ -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>
  *
@@ -188,7 +188,7 @@ static const struct {
 
 /* Cleanup callback fired on closure of mux slave _session_ channel */
 /* ARGSUSED */
-static void
+void
 mux_master_session_cleanup_cb(int cid, void *unused)
 {
         Channel *cc, *c = channel_by_id(cid);