From ea8342c248ad6c0a4fe1a70de133f954973bd2b2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 6 Jun 2013 08:11:40 +1000
Subject:    - dtucker@cvs.openbsd.org 2013/06/02 23:36:29      [clientloop.h
 clientloop.c mux.c]      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@

---
 clientloop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'clientloop.c')

diff --git a/clientloop.c b/clientloop.c
index 4b071eb91..6a2963583 100644
--- a/clientloop.c
+++ b/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
@@ -1109,8 +1109,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;
-- 
cgit v1.2.3