[netfilter-cvslog] r4552 - trunk/iptables

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-24 18:04:05 +0100 (Thu, 24 Nov 2005)
New Revision: 4552

Modified:
   trunk/iptables/iptables-save.c
   trunk/iptables/iptables.c
Log:
fix compilation of iptables on [old] systems that don't have IPT_F_GOTO


Modified: trunk/iptables/iptables-save.c
===================================================================
--- trunk/iptables/iptables-save.c	2005-11-24 09:31:53 UTC (rev 4551)
+++ trunk/iptables/iptables-save.c	2005-11-24 17:04:05 UTC (rev 4552)
@@ -197,7 +197,11 @@
 	/* Print target name */	
 	target_name = iptc_get_target(e, h);
 	if (target_name && (*target_name != '\0'))
+#ifdef IPT_F_GOTO
 		printf("-%c %s ", e->ip.flags & IPT_F_GOTO ? 'g' : 'j', target_name);
+#else
+		printf("-j %s ", target_name);
+#endif
 
 	/* Print targinfo part */
 	t = ipt_get_target((struct ipt_entry *)e);

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2005-11-24 09:31:53 UTC (rev 4551)
+++ trunk/iptables/iptables.c	2005-11-24 17:04:05 UTC (rev 4552)
@@ -1415,8 +1415,10 @@
 	if (format & FMT_NOTABLE)
 		fputs("  ", stdout);
 
+#ifdef IPT_F_GOTO
 	if(fw->ip.flags & IPT_F_GOTO)
 		printf("[goto] ");
+#endif
 
 	IPT_MATCH_ITERATE(fw, print_match, &fw->ip, format & FMT_NUMERIC);