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/libxt_esp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libxt_esp.c') diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c index bd7b643d..5e8c58d3 100644 --- a/extensions/libxt_esp.c +++ b/extensions/libxt_esp.c @@ -95,10 +95,10 @@ static int esp_xlate(const void *ip, const struct xt_entry_match *match, xt_xlate_add(xl, "esp spi%s", (espinfo->invflags & XT_ESP_INV_SPI) ? " !=" : ""); if (espinfo->spis[0] != espinfo->spis[1]) - xt_xlate_add(xl, " %u-%u ", espinfo->spis[0], + xt_xlate_add(xl, " %u-%u", espinfo->spis[0], espinfo->spis[1]); else - xt_xlate_add(xl, " %u ", espinfo->spis[0]); + xt_xlate_add(xl, " %u", espinfo->spis[0]); } return 1; -- cgit v1.2.3