[PATCH] iptables-translate: Printing the table name before chain name

[PATCH] iptables-translate: Printing the table name before chain name

[Guruswamy Basavaiah]

Printing the table name before chain name.

Command ./iptables-restore-translate, was printing
table name before the chain name for user added chains.
This is breaking ./nft -f command.

Before fix, output of "./iptables-restore-translate"
add chain ip OUTPUT_direct raw

After fix:
add chain ip raw OUTPUT_direct

Signed-off-by: Guruswamy Basavaiah <guru2018@gmail.com>
---
 iptables/xtables-translate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c
index 44162a2..07cc98c 100644
--- a/iptables/xtables-translate.c
+++ b/iptables/xtables-translate.c
@@ -296,7 +296,7 @@ static const struct option options[] = {
 static int xlate_chain_user_add(struct nft_handle *h, const char *chain,
                                const char *table)
 {
-       printf("add chain %s %s %s\n", family2str[h->family], chain, table);
+       printf("add chain %s %s %s\n", family2str[h->family], table, chain);
        return 0;
 }

--
2.5.0

Re: [PATCH] iptables-translate: Printing the table name before chain name

[Pablo Neira Ayuso]

On Tue, Apr 05, 2016 at 12:38:37PM +0530, Guruswamy Basavaiah wrote:
> Printing the table name before chain name.
> 
> Command ./iptables-restore-translate, was printing
> table name before the chain name for user added chains.
> This is breaking ./nft -f command.
> 
> Before fix, output of "./iptables-restore-translate"
> add chain ip OUTPUT_direct raw
> 
> After fix:
> add chain ip raw OUTPUT_direct

I want to take this fix, but it doesn't apply:

$ git am /tmp/iptables-translate-Printing-the-table-name-before-chain-name.patch -s
Applying: iptables-translate: Printing the table name before chain name
error: patch failed: iptables/xtables-translate.c:296
error: iptables/xtables-translate.c: patch does not apply
Patch failed at 0001 iptables-translate: Printing the table name before chain name
The copy of the patch that failed is found in:
   /home/pablo/devel/scm/git-netfilter/iptables/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".