Attachment #1839 for bug #1758

View | Details | Raw Unified | Return to bug 1758
Collapse All | Expand All




CFLAGS+=	-I${.CURDIR}/..

CDIAGFLAGS=	-Wall
CDIAGFLAGS+=	-Werror
CDIAGFLAGS+=	-Wpointer-arith
CDIAGFLAGS+=	-Wno-uninitialized
CDIAGFLAGS+=	-Wstrict-prototypes

CDIAGFLAGS+=	-Wbounded
CDIAGFLAGS+=	-Wshadow

DEBUG=-g

CFLAGS+=	-DJPAKE

CFLAGS+=	-DENABLE_PKCS11
.include <bsd.own.mk>

Lines 437-443 process_mux_new_session(u_int rid, Chann Link Here

(-)mux.c (-2 / +2 lines)
437		437
438	channel_send_open(nc->self);	438	channel_send_open(nc->self);
439	channel_register_open_confirm(nc->self, mux_session_confirm, cctx);	439	channel_register_open_confirm(nc->self, mux_session_confirm, cctx);
440	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0);	440	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1);
441		441
442	/* prepare reply */	442	/* prepare reply */
443	/* XXX defer until mux_session_confirm() fires */	443	/* XXX defer until mux_session_confirm() fires */
Lines 809-815 process_mux_stdio_fwd(u_int rid, Channel Link Here
809	debug2("%s: channel_new: %d linked to control channel %d",	809	debug2("%s: channel_new: %d linked to control channel %d",
810	__func__, nc->self, nc->ctl_chan);	810	__func__, nc->self, nc->ctl_chan);
811		811
812	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0);	812	channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1);
813		813
814	/* prepare reply */	814	/* prepare reply */
815	/* XXX defer until channel confirmed */	815	/* XXX defer until channel confirmed */

Return to bug 1758

Lines 3-9 Link Here

(-)Makefile.inc (-3 / +3 lines)
3	CFLAGS+= -I${.CURDIR}/..	3	CFLAGS+= -I${.CURDIR}/..
4		4
5	CDIAGFLAGS= -Wall	5	CDIAGFLAGS= -Wall
6	#CDIAGFLAGS+= -Werror	6	CDIAGFLAGS+= -Werror
7	CDIAGFLAGS+= -Wpointer-arith	7	CDIAGFLAGS+= -Wpointer-arith
8	CDIAGFLAGS+= -Wno-uninitialized	8	CDIAGFLAGS+= -Wno-uninitialized
9	CDIAGFLAGS+= -Wstrict-prototypes	9	CDIAGFLAGS+= -Wstrict-prototypes
Lines 13-21 CDIAGFLAGS+= -Wsign-compare Link Here
13	CDIAGFLAGS+= -Wbounded	13	CDIAGFLAGS+= -Wbounded
14	CDIAGFLAGS+= -Wshadow	14	CDIAGFLAGS+= -Wshadow
15		15
16	#DEBUG=-g	16	DEBUG=-g
17		17
18	#CFLAGS+= -DJPAKE	18	CFLAGS+= -DJPAKE
19		19
20	CFLAGS+= -DENABLE_PKCS11	20	CFLAGS+= -DENABLE_PKCS11
21	.include <bsd.own.mk>	21	.include <bsd.own.mk>