kern/66125: sys/netinet/tcp_input.c does not build if IPSEC and not INET6

[Cyrille Lefevre]

>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 at 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: