From c885af49e84e3714513ab1ca083b91ae2dd31ca0 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 13 Dec 2011 04:30:07 +0700 Subject: Fix rule prefix display for rules that are masquerade and exclude at the same time. --- scripts/vyatta-show-nat-rules.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-show-nat-rules.pl b/scripts/vyatta-show-nat-rules.pl index 554670c..c6e2d1e 100755 --- a/scripts/vyatta-show-nat-rules.pl +++ b/scripts/vyatta-show-nat-rules.pl @@ -42,7 +42,7 @@ my $src_level = "nat source rule"; my $dst_level = "nat destination rule"; my $level = undef; -my $format1 = "%-5s %-16s %-58s"; +my $format1 = "%-6s %-16s %-58s"; my $format2 = " %-16s %-62s"; sub numerically { $a <=> $b; } @@ -205,8 +205,8 @@ for $rule (@rules) { $nrule->setupOrig("$level $rule"); next if defined $nrule->{_disable}; - $rulenum = "X" . $rule if defined $nrule->{_exclude}; - $rulenum = "M". $rule if defined $nrule->{_is_masq}; + $rulenum = "X" . $rulenum if defined $nrule->{_exclude}; + $rulenum = "M". $rulenum if defined $nrule->{_is_masq}; $protocol = $nrule->{_proto} if defined $nrule->{_proto}; $protocol = "proto-" . $protocol; $interface = $nrule->{_inbound_if} if defined $nrule->{_inbound_if}; -- cgit v1.2.3