From owner-freebsd-bugs@FreeBSD.ORG Fri Apr 30 15:10:23 2004 Return-Path: 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 4596516A4D1 for ; Fri, 30 Apr 2004 15:10:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 157A943D31 for ; Fri, 30 Apr 2004 15:10:23 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3UMAM9t064464 for ; Fri, 30 Apr 2004 15:10:22 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i3UMAM7x064462; Fri, 30 Apr 2004 15:10:22 -0700 (PDT) (envelope-from gnats) Resent-Date: Fri, 30 Apr 2004 15:10:22 -0700 (PDT) Resent-Message-Id: <200404302210.i3UMAM7x064462@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Cyrille Lefevre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94A2416A4CF for ; Fri, 30 Apr 2004 15:06:01 -0700 (PDT) Received: from huva.hittite.isp.9tel.net (huva.hittite.isp.9tel.net [62.62.156.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 063F643D41 for ; Fri, 30 Apr 2004 15:06:01 -0700 (PDT) (envelope-from cyrille.lefevre@laposte.net) Received: from mail.gits.dyndns.org (9-59-118-80.kaptech.net [80.118.59.9]) by huva.hittite.isp.9tel.net (Postfix) with ESMTP id 0A4E59BF48 for ; Sat, 1 May 2004 00:07:12 +0200 (CEST) Received: from gits.gits.fr.invalid (IDENT:wndk0c5riv3rn39g@localhost [127.0.0.1])i3UM5kGw083066 for ; Sat, 1 May 2004 00:05:47 +0200 (CEST) (envelope-from cyrille.lefevre@laposte.net) Received: by gits.gits.fr.invalid (tmda-sendmail, from uid 0); Sat, 01 May 2004 00:05:45 +0200 (CEST) Message-Id: <20040430220533.GA52456@gits.dyndns.org> Date: Sat, 1 May 2004 00:05:34 +0200 From: Cyrille Lefevre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/66125: sys/netinet/tcp_input.c does not build if IPSEC and not INET6 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Cyrille Lefevre List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 22:10:23 -0000 >Number: 66125 >Category: kern >Synopsis: sys/netinet/tcp_input.c does not build if IPSEC and not INET6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 30 15:10:22 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 5.2-CURRENT i386 >Organization: ACME >Environment: System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #26: Tue Apr 27 03:51:12 CEST 2004 root@gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386 >Description: sys/netinet/tcp_input.c does not build if IPSEC and not INET6 >How-To-Repeat: n/a >Fix: Index: tcp_input.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v retrieving revision 1.234 diff -u -I$Id.*$ -I$.+BSD.*$ -r1.234 tcp_input.c --- tcp_input.c 23 Apr 2004 22:44:59 -0000 1.234 +++ tcp_input.c 25 Apr 2004 23:24:40 -0000 @@ -641,6 +641,7 @@ } #if defined(IPSEC) || defined(FAST_IPSEC) +#ifdef INET6 if (isipv6) { if (inp != NULL && ipsec6_in_reject(m, inp)) { #ifdef IPSEC @@ -648,7 +649,9 @@ #endif /*IPSEC*/ goto drop; } - } else if (inp != NULL && ipsec4_in_reject(m, inp)) { + } else +#endif + if (inp != NULL && ipsec4_in_reject(m, inp)) { #ifdef IPSEC ipsecstat.in_polvio++; #endif /*IPSEC*/ >Release-Note: >Audit-Trail: >Unformatted: