From owner-freebsd-bugs@FreeBSD.ORG  Mon Feb 27 07:02:27 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1D82D16A422
	for <freebsd-bugs@hub.freebsd.org>;
	Mon, 27 Feb 2006 07:02:27 +0000 (GMT)
	(envelope-from darrenr@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E1F2F43D45;
	Mon, 27 Feb 2006 07:02:26 +0000 (GMT)
	(envelope-from darrenr@FreeBSD.org)
Received: from freefall.freebsd.org (darrenr@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1R72QYp031638;
	Mon, 27 Feb 2006 07:02:26 GMT
	(envelope-from darrenr@freefall.freebsd.org)
Received: (from darrenr@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1R72Q93031637;
	Mon, 27 Feb 2006 07:02:26 GMT (envelope-from darrenr)
Date: Mon, 27 Feb 2006 07:02:26 GMT
From: Darren Reed <darrenr@FreeBSD.org>
Message-Id: <200602270702.k1R72Q93031637@freefall.freebsd.org>
To: tijmen@tijmen.net
Cc: freebsd-bugs@FreeBSD.org
Subject: Re: kern/91777
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Feb 2006 07:02:27 -0000


Patch below.

Darren

--- fil.c       31 Dec 2005 13:35:42 -0000      2.243.2.73
+++ fil.c       26 Feb 2006 09:57:58 -0000
@@ -2021,18 +2020,20 @@
                (void) strncpy(fin->fin_group, fr->fr_group, FR_GROUPLEN);
                if (fr->fr_grp != NULL) {
                        fin->fin_fr = *fr->fr_grp;
-                       pass = fr_scanlist(fin, pass);
+                       passt = fr_scanlist(fin, pass);
                        if (fin->fin_fr == NULL) {
                                fin->fin_rule = rulen;
                                (void) strncpy(fin->fin_group, fr->fr_group,
                                               FR_GROUPLEN);
                                fin->fin_fr = fr;
+                               passt = pass;
                        }
                        if (fin->fin_flx & FI_DONTCACHE)
                                logged = 1;
+                       pass = passt;
                }
 
-               if (pass & FR_QUICK) {
+               if (passt & FR_QUICK) {
                        /*
                         * Finally, if we've asked to track state for this
                         * packet, set it up.  Add state for "quick" rules