poll goto specific changes out of trunk

diff --git a/iptables-save.c b/iptables-save.c
index 4f6f156d7b3d98fade727f975bde72aaf07b27ba..6c7267e20ce0d5b7948302da65d7bc715ef6c2eb 100644 (file)
--- a/iptables-save.c
+++ b/iptables-save.c
@@ -197,7 +197,7 @@ static void print_rule(const struct ipt_entry *e,
        /* Print target name */ 
        target_name = iptc_get_target(e, h);
        if (target_name && (*target_name != '\0'))
-               printf("-%c %s ", e->ip.flags & IPT_F_GOTO ? 'g' : 'j', target_name);
+               printf("-j %s ", target_name);
 
        /* Print targinfo part */
        t = ipt_get_target((struct ipt_entry *)e);

diff --git a/iptables.c b/iptables.c
index cfea34fa2d1de4ec18c6eef204b65a3ee1e4cafa..27c5cface2bffa3f82fa47e2e8751059203dd5bc 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1393,9 +1393,6 @@ print_firewall(const struct ipt_entry *fw,
        if (format & FMT_NOTABLE)
                fputs("  ", stdout);
 
-       if(fw->ip.flags & IPT_F_GOTO)
-               printf("[goto] ");
-
        IPT_MATCH_ITERATE(fw, print_match, &fw->ip, format & FMT_NUMERIC);
 
        if (target) {