Attachment 1839 Details for Bug 1758 – send-close-on-mux-session-close.diff

[patch] send-close-on-mux-session-close.diff

send-close-on-mux-session-close.diff (text/plain), 1.74 KB, created by Damien Miller on 2010-04-17 17:02:46 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2010-04-17 17:02:46 AEST

Size: 1.74 KB

patch

obsolete

>? PROTOCOL.certkeys.new
>? auth2-pubkey.c.new
>? send-close-on-mux-session-close.diff
>Index: Makefile.inc
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/Makefile.inc,v
>retrieving revision 1.36
>diff -u -p -r1.36 Makefile.inc
>--- Makefile.inc	20 Feb 2010 20:28:11 -0000	1.36
>+++ Makefile.inc	17 Apr 2010 07:00:49 -0000
>@@ -3,7 +3,7 @@
> CFLAGS+=	-I${.CURDIR}/..
> 
> CDIAGFLAGS=	-Wall
>-#CDIAGFLAGS+=	-Werror
>+CDIAGFLAGS+=	-Werror
> CDIAGFLAGS+=	-Wpointer-arith
> CDIAGFLAGS+=	-Wno-uninitialized
> CDIAGFLAGS+=	-Wstrict-prototypes
>@@ -13,9 +13,9 @@ CDIAGFLAGS+=	-Wsign-compare
> CDIAGFLAGS+=	-Wbounded
> CDIAGFLAGS+=	-Wshadow
> 
>-#DEBUG=-g
>+DEBUG=-g
> 
>-#CFLAGS+=	-DJPAKE
>+CFLAGS+=	-DJPAKE
> 
> CFLAGS+=	-DENABLE_PKCS11
> .include <bsd.own.mk>
>Index: mux.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/mux.c,v
>retrieving revision 1.15
>diff -u -p -r1.15 mux.c
>--- mux.c	10 Apr 2010 05:48:16 -0000	1.15
>+++ mux.c	17 Apr 2010 07:00:49 -0000
>@@ -437,7 +437,7 @@ process_mux_new_session(u_int rid, Chann
> 
> 	channel_send_open(nc->self);
> 	channel_register_open_confirm(nc->self, mux_session_confirm, cctx);
>-	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0);
>+	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1);
> 
> 	/* prepare reply */
> 	/* XXX defer until mux_session_confirm() fires */
>@@ -809,7 +809,7 @@ process_mux_stdio_fwd(u_int rid, Channel
> 	debug2("%s: channel_new: %d linked to control channel %d",
> 	    __func__, nc->self, nc->ctl_chan);
> 
>-	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0);
>+	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1);
> 
> 	/* prepare reply */
> 	/* XXX defer until channel confirmed */

Actions: View | Diff

Attachments on bug 1758: 1839