From owner-freebsd-current@FreeBSD.ORG  Wed Dec 24 10:24:15 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4753E16A4CE
	for <freebsd-current@freebsd.org>;
	Wed, 24 Dec 2003 10:24:15 -0800 (PST)
Received: from cheer.mahoroba.org (flets20-024.kamome.or.jp [218.45.20.24])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B478643D1F
	for <freebsd-current@freebsd.org>;
	Wed, 24 Dec 2003 10:24:09 -0800 (PST)
	(envelope-from ume@mahoroba.org)
Received: from lyrics.mahoroba.org
	(IDENT:8QbXSfH8A4iJdmavaOYOMReTa1OtsBKOg84JSDr9hhSpI990i3Mlosr4NUuWTbxI@lyrics.mahoroba.org
	[IPv6:3ffe:501:185b:8010:280:88ff:fe03:4841])
	(user=ume mech=CRAM-MD5 bits=0)hBOIKMGx039015
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 25 Dec 2003 03:20:26 +0900 (JST)
	(envelope-from ume@mahoroba.org)
Date: Thu, 25 Dec 2003 03:23:58 +0900
Message-ID: <ygebrpy8475.wl%ume@mahoroba.org>
From: Hajimu UMEMOTO <ume@mahoroba.org>
To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>
In-Reply-To: <Pine.BSF.4.53.0312240821390.74127@e0-0.zab2.int.zabbadoz.net>
References: <1072199407.17290.1.camel@server.mcneil.com>
	<20031224111720.W84575@news1.macomnet.ru>
	<Pine.BSF.4.53.0312240821390.74127@e0-0.zab2.int.zabbadoz.net>
User-Agent: xcite1.38> Wanderlust/2.11.3 (Wonderwall) SEMI/1.14.5
 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/21.3
 (i386--freebsd) MULE/5.0 (=?ISO-2022-JP?B?GyRCOC1MWhsoQg==?=)
X-Operating-System: FreeBSD 5.2-CURRENT
MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen")
Content-Type: text/plain; charset=US-ASCII
X-Virus-Scanned: by amavisd-new
X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.60
X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on 
	cheer.mahoroba.org
X-Mailman-Approved-At: Thu, 25 Dec 2003 04:50:36 -0800
cc: freebsd-current@freebsd.org
cc: Sean McNeil <sean@mcneil.com>
Subject: Re: sys/netinet/ip_fw2.c fails to compile
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Dec 2003 18:24:15 -0000

Hi,

>>>>> On Wed, 24 Dec 2003 08:32:27 +0000 (UTC)
>>>>> "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> said:

bzeeb> so some patch like this looks ok to me:

bzeeb> --- src-20031223-01/sys/netinet/ip_fw2.c.orig	Tue Dec 23 20:25:20 2003
bzeeb> +++ src-20031223-01/sys/netinet/ip_fw2.c	Tue Dec 23 20:26:28 2003
bzeeb> @@ -1915,7 +1915,7 @@
bzeeb>  				    PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL);
bzeeb>  #endif
bzeeb>  #ifdef IPSEC
bzeeb> -				match = (ipsec_getnhist(m) != NULL);
bzeeb> +				match = (ipsec_getnhist(m) != 0);
bzeeb>  #endif
bzeeb>  				/* otherwise no match */
bzeeb>  				break;

Thanks, committed.

Sincerely,

--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org  ume@bisd.hitachi.co.jp  ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/