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_owner.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extensions/libxt_owner.c') diff --git a/extensions/libxt_owner.c b/extensions/libxt_owner.c index 1ee58ff6..249ba5a0 100644 --- a/extensions/libxt_owner.c +++ b/extensions/libxt_owner.c @@ -499,10 +499,10 @@ owner_mt_print_uid_xlate(const struct xt_owner_match_info *info, xt_xlate_add(xl, "skuid%s ", info->invert ? " !=" : ""); if (info->uid_min != info->uid_max) - xt_xlate_add(xl, "%u-%u ", (unsigned int)info->uid_min, + xt_xlate_add(xl, "%u-%u", (unsigned int)info->uid_min, (unsigned int)info->uid_max); else - xt_xlate_add(xl, "%u ", (unsigned int)info->uid_min); + xt_xlate_add(xl, "%u", (unsigned int)info->uid_min); return 1; } @@ -514,10 +514,10 @@ owner_mt_print_gid_xlate(const struct xt_owner_match_info *info, xt_xlate_add(xl, "skgid%s ", info->invert ? " !=" : ""); if (info->gid_min != info->gid_max) - xt_xlate_add(xl, "%u-%u ", (unsigned int)info->gid_min, + xt_xlate_add(xl, "%u-%u", (unsigned int)info->gid_min, (unsigned int)info->gid_max); else - xt_xlate_add(xl, "%u ", (unsigned int)info->gid_min); + xt_xlate_add(xl, "%u", (unsigned int)info->gid_min); return 1; } -- cgit v1.2.3