summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2022-07-27 14:14:23 +0200
committerPhil Sutter <phil@nwl.cc>2022-07-29 11:53:54 +0200
commitba98dc47073b46c3a514039baaddcebecb4e738d (patch)
tree916bd0c38509ad6f5f09f949f807eb5005d2fa18
parent68e09d49ef26c024e3c541d0427e389da0d5dc67 (diff)
xshared: Fix for missing space after 'prot' column
Format string ensured a minimum field width of five characters, but allowed for longer strings to eat the column delimiting white space. Signed-off-by: Phil Sutter <phil@nwl.cc>
-rwxr-xr-xiptables/tests/shell/testcases/ip6tables/0002-verbose-output_02
-rw-r--r--iptables/xshared.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0 b/iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0
index 4e754156..dad01a98 100755
--- a/iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0
+++ b/iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0
@@ -35,7 +35,7 @@ Chain FORWARD (policy ACCEPT 0 packets, 0 bytes)
pkts bytes target prot opt in out source destination
0 0 ACCEPT all -- eth2 eth3 feed:babe::1 feed:babe::2
0 0 ACCEPT all -- eth2 eth3 feed:babe::4 feed:babe::5
- 0 0 ipv6-icmp-- * * ::/0 ::/0 ipv6-icmptype 1 code 0
+ 0 0 ipv6-icmp -- * * ::/0 ::/0 ipv6-icmptype 1 code 0
0 0 all -- * * ::/0 ::/0 dst length:42 rt type:23
0 0 LOG all -- * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4
diff --git a/iptables/xshared.c b/iptables/xshared.c
index b1088c82..ccec4ff1 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -1093,9 +1093,9 @@ void print_rule_details(unsigned int linenum, const struct xt_counters *ctrs,
fputc(invflags & XT_INV_PROTO ? '!' : ' ', stdout);
if (pname)
- printf(FMT("%-5s", "%s "), pname);
+ printf(FMT("%-4s ", "%s "), pname);
else
- printf(FMT("%-5hu", "%hu "), proto);
+ printf(FMT("%-4hu ", "%hu "), proto);
}
void save_rule_details(const char *iniface, unsigned const char *iniface_mask,