From cyrille.lefevre@laposte.net  Fri Apr 30 15:06:01 2004
Return-Path: <cyrille.lefevre@laposte.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 94A2416A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; Sat,  1 May 2004 00:07:12 +0200 (CEST)
Received: from gits.gits.fr.invalid (IDENT:wndk0c5riv3rn39g@localhost [127.0.0.1])
	by mail.gits.dyndns.org (8.12.11/8.12.11) with ESMTP id i3UM5kGw083066
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <cyrille.lefevre@laposte.net>
Reply-To: Cyrille Lefevre <cyrille.lefevre@laposte.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: sys/netinet/tcp_input.c does not build if IPSEC and not INET6
X-Send-Pr-Version: 3.113

>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:    bms
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 30 15:10:22 PDT 2004
>Closed-Date:    Wed Jun 16 09:35:13 GMT 2004
>Last-Modified:  Wed Jun 16 09:35:13 GMT 2004
>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:
Responsible-Changed-From-To: freebsd-bugs->bms 
Responsible-Changed-By: bms 
Responsible-Changed-When: Wed Jun 16 09:23:14 GMT 2004 
Responsible-Changed-Why:  
I'll take this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66125 
State-Changed-From-To: open->closed 
State-Changed-By: bms 
State-Changed-When: Wed Jun 16 09:35:03 GMT 2004 
State-Changed-Why:  
Committed. thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66125 
>Unformatted:
