From f035be35c749d5c5cbb7ffdbcd1c548b91bd3033 Mon Sep 17 00:00:00 2001 From: "Pablo M. Bermudo Garay" Date: Sat, 9 Jul 2016 12:27:51 +0200 Subject: xtables-translate: fix multiple spaces issue This patch fixes a multiple spaces issue. The problem arises when a rule set loaded through iptables-compat-restore is listed in nft. Before this commit, two spaces were printed after every match translation: $ sudo iptables-save *filter :INPUT ACCEPT [0:0] -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -A INPUT -p tcp -m multiport --dports 80:85 -m ttl --ttl-gt 5 -j ACCEPT COMMIT $ sudo iptables-compat-restore iptables-save $ sudo nft list ruleset table ip filter { chain INPUT { type filter hook input priority 0; policy accept; ct state related,established counter packets 0 bytes 0 accept ^^ ip protocol tcp tcp dport 80-85 ip ttl gt 5 counter packets 0 bytes 0 accept ^^ ^^ } } Signed-off-by: Pablo M. Bermudo Garay Signed-off-by: Pablo Neira Ayuso --- extensions/libipt_realm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/libipt_realm.c') diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index 0a4bc3b3..b5c9032b 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -115,16 +115,16 @@ print_realm_xlate(unsigned long id, unsigned long mask, const char *name = NULL; if (mask != 0xffffffff) - xt_xlate_add(xl, " and 0x%lx %s 0x%lx ", mask, + xt_xlate_add(xl, " and 0x%lx %s 0x%lx", mask, op == XT_OP_EQ ? "==" : "!=", id); else { if (numeric == 0) name = xtables_lmap_id2name(realms, id); if (name) - xt_xlate_add(xl, "%s%s ", + xt_xlate_add(xl, "%s%s", op == XT_OP_EQ ? "" : "!= ", name); else - xt_xlate_add(xl, " %s0x%lx ", + xt_xlate_add(xl, " %s0x%lx", op == XT_OP_EQ ? "" : "!= ", id); } } -- cgit v1.2.3