From owner-freebsd-current@FreeBSD.ORG Wed Dec 24 00:40:12 2003 Return-Path: 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 2EAD316A4CE; Wed, 24 Dec 2003 00:40:12 -0800 (PST) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8354643D2D; Wed, 24 Dec 2003 00:40:10 -0800 (PST) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id BE1EC1FF91D; Wed, 24 Dec 2003 09:40:08 +0100 (CET) Received: by transport.cksoft.de (Postfix, from userid 66) id 0FF101FF90C; Wed, 24 Dec 2003 09:40:07 +0100 (CET) Received: by mail.int.zabbadoz.net (Postfix, from userid 1060) id AB084153F9; Wed, 24 Dec 2003 08:32:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.int.zabbadoz.net (Postfix) with ESMTP id A08B3153EB; Wed, 24 Dec 2003 08:32:27 +0000 (UTC) Date: Wed, 24 Dec 2003 08:32:27 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@e0-0.zab2.int.zabbadoz.net To: Maxim Konovalov In-Reply-To: <20031224111720.W84575@news1.macomnet.ru> Message-ID: References: <1072199407.17290.1.camel@server.mcneil.com> <20031224111720.W84575@news1.macomnet.ru> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de cc: freebsd-current@freebsd.org cc: Sean McNeil cc: ume@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Dec 2003 08:40:12 -0000 On Wed, 24 Dec 2003, Maxim Konovalov wrote: > On Tue, 23 Dec 2003, 09:10-0800, Sean McNeil wrote: > > > Hi folks, > > > > line 1918 of this file has a comparison against NULL when the function > > ipsec_getnhist() appears to return int. This causes a failure in my > > build of -CURRENT. echo $CFLAGS ? > We should ask ume@. ipsec_getnhist() prototype is a bit strange. in all cases it returns an (int). I think this is because of the change from ipsec_gethist which returned an struct ipsec_history * . I must have missed it last time I asked for a change in ip_fw2.c after I got the panic for the obsolete (and now removed ipsec_gethist). so some patch like this looks ok to me: --- src-20031223-01/sys/netinet/ip_fw2.c.orig Tue Dec 23 20:25:20 2003 +++ src-20031223-01/sys/netinet/ip_fw2.c Tue Dec 23 20:26:28 2003 @@ -1915,7 +1915,7 @@ PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL); #endif #ifdef IPSEC - match = (ipsec_getnhist(m) != NULL); + match = (ipsec_getnhist(m) != 0); #endif /* otherwise no match */ break; -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT 56 69 73 69 74 http://www.zabbadoz.net/