From owner-freebsd-stable@FreeBSD.ORG  Sat Jul 19 22:25:00 2003
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E756637B401
	for <stable@freebsd.org>; Sat, 19 Jul 2003 22:25:00 -0700 (PDT)
Received: from mx1.evo6.net (mx1.evo6.net [80.76.194.10])
	by mx1.FreeBSD.org (Postfix) with SMTP id 4F26743F3F
	for <stable@freebsd.org>; Sat, 19 Jul 2003 22:24:59 -0700 (PDT)
	(envelope-from andy@mx1.evo6.net)
Received: (qmail 85586 invoked by uid 1001); 20 Jul 2003 05:24:57 -0000
Date: 20 Jul 2003 05:24:57 -0000
Message-ID: <20030720052457.68999.qmail@mx1.evo6.net>
To: FreeBSD-gnats-submit@freebsd.org
From: Andy Gilligan <andy@evo6.org>
X-send-pr-version: 3.113
X-GNATS-Notify: 
X-Spam-Status: No, hits=-0.5 required=5.0
	tests=PATCH_UNIFIED_DIFF
	version=2.55-evo6.net
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.55-evo6.net (1.174.2.19-2003-05-19-exp)
cc: stable@freebsd.org
Subject: [PATCH] ipfw2 fails with 'bad command' error
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: Andy Gilligan <andy@evo6.org>
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2003 05:25:01 -0000


>Submitter-Id:	current-users
>Originator:	Andy Gilligan
>Confidential:	no
>Synopsis:	[PATCH] ipfw2 fails with 'bad command' error
>Severity:	serious
>Priority:	high
>Category:	bin
>Class:		sw-bug
>Release:	FreeBSD 4.8-STABLE i386
>Environment:
System: FreeBSD vega 4.8-STABLE FreeBSD 4.8-STABLE #13: Sun Jul 20 01:01:07 BST 2003 root@vega:/usr/obj/usr/src/sys/VEGA i386

>Description:

	When using a program to preprocess rules, /sbin/ipfw will
	fail with a 'bad command' error if those rules contain any
	pipe or queue definitions.

	This only affects IPFW2.

>How-To-Repeat:

	Create /etc/ipfw.rules containing:

	pipe 1 config bw 500kbit/s
	add pipe 1 all from any to any

	Then execute:

	# ipfw -p cat /etc/ipfw.rules
	command is cat
	Line 2: bad command `pipe'

	Using any preprocessor that generates those rules will
	give the same error.

>Fix:

	Correctly initialise the 'do_pipe' variable in ipfw_main()

Index: sbin/ipfw/ipfw2.c
===================================================================
RCS file: /data/cvs/freebsd/src/sbin/ipfw/ipfw2.c,v
retrieving revision 1.4.2.16
diff -u -r1.4.2.16 ipfw2.c
--- sbin/ipfw/ipfw2.c	17 Jul 2003 06:03:39 -0000	1.4.2.16
+++ sbin/ipfw/ipfw2.c	20 Jul 2003 04:51:28 -0000
@@ -3591,6 +3591,7 @@
 	char **av, **save_av;
 	int do_acct = 0;		/* Show packet/byte count */
 	int do_force = 0;		/* Don't ask for confirmation */
+	do_pipe = 0;
 
 #define WHITESP		" \t\f\v\n\r"
 	if (oldac == 0)