[netfilter-cvslog] r3793 - branches/netfilter-ha/linux-2.6-actact/ct_sync

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-03-12 15:43:05 +0100 (Sat, 12 Mar 2005)
New Revision: 3793

Modified:
   branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_main.c
Log:
fix compilation without nat


Modified: branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_main.c
===================================================================
--- branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_main.c	2005-03-12 14:32:33 UTC (rev 3792)
+++ branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_main.c	2005-03-12 14:43:05 UTC (rev 3793)
@@ -42,6 +42,7 @@
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
+#include <linux/netfilter_ipv4/ip_nat.h>
 #include <linux/netfilter_ipv4/ip_nat_core.h>
 #include <linux/netfilter_ipv4/ip_nat_helper.h>
 
@@ -318,10 +319,12 @@
 		/* if conntrack has a helper, update helper info */
 		if (ct->helper)
 			memcpy(&ct->help, &sct->help, sizeof(ct->help));
+#ifdef CONFIG_IP_NF_NAT_NEEDED
 		/* if there is a nat helper present, update helper info */
 		if (sct->nat_initialized && ct->nat.info.initialized &&
 		    ct->nat.info.helper)
 			memcpy(&ct->nat.help, &sct->nat_help, sizeof(ct->nat.help));
+#endif
 	} else {
 #ifdef CONFIG_IP_NF_NAT_NEEDED
 		struct ip_nat_info *nat = &ct->nat.info;