Module Name:    src
Committed By:   mrg
Date:           Sun Oct 16 05:11:34 UTC 2016

Modified Files:
        src/sys/external/bsd/ipf/netinet: ip_ftp_pxy.c

Log Message:
fix !INET6 builds


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c
diff -u src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c:1.5 src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c:1.6
--- src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c:1.5	Thu Mar 20 20:43:12 2014
+++ src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c	Sun Oct 16 05:11:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_ftp_pxy.c,v 1.5 2014/03/20 20:43:12 christos Exp $	*/
+/*	$NetBSD: ip_ftp_pxy.c,v 1.6 2016/10/16 05:11:34 mrg Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.5 2014/03/20 20:43:12 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.6 2016/10/16 05:11:34 mrg Exp $");
 
 #define	IPF_FTP_PROXY
 
@@ -497,8 +497,8 @@ ipf_p_ftp_addport(ipf_ftp_softc_t *softf
 	 * Add skeleton NAT entry for connection which will come back the
 	 * other way.
 	 */
-	if (nat->nat_v[0] == 6) {
 #ifdef USE_INET6
+	if (nat->nat_v[0] == 6) {
 		if (nat->nat_dir == NAT_OUTBOUND) {
 			nat2 = ipf_nat6_outlookup(&fi, IPN_TCP|NAT_SEARCH,
 						  nat->nat_pr[1],
@@ -510,8 +510,9 @@ ipf_p_ftp_addport(ipf_ftp_softc_t *softf
 						 &nat->nat_odst6.in6,
 						 &nat->nat_osrc6.in6);
 		}
+	} else
 #endif
-	} else {
+	{
 		if (nat->nat_dir == NAT_OUTBOUND) {
 			nat2 = ipf_nat_outlookup(&fi, IPN_TCP|NAT_SEARCH,
 						 nat->nat_pr[1],

Reply via email to