[PATCH] iptables compilation on <=2.6.13

[Phil Oester <kernel@linuxace.com>]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

Iptables since at least 1.3.3 will not compile with kernels <= 2.6.13
due to addition of the goto target.  Below patch corrects this, and
closes bug #386.

Phil



[-- Attachment #2: patch-goto --]
[-- Type: text/plain, Size: 933 bytes --]

diff -ru ipt-orig/iptables.c ipt-new/iptables.c
--- ipt-orig/iptables.c	2005-11-17 05:04:49.000000000 -0800
+++ ipt-new/iptables.c	2005-11-23 14:03:21.000000000 -0800
@@ -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);
 
diff -ru ipt-orig/iptables-save.c ipt-new/iptables-save.c
--- ipt-orig/iptables-save.c	2005-11-05 01:26:40.000000000 -0800
+++ ipt-new/iptables-save.c	2005-11-23 14:27:12.000000000 -0800
@@ -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);