diff options
| -rwxr-xr-x | lib/Vyatta/FirewallOpMode/Summary.pm | 10 | ||||
| -rwxr-xr-x | scripts/firewall/vyatta-show-firewall.pl | 15 |
2 files changed, 2 insertions, 23 deletions
diff --git a/lib/Vyatta/FirewallOpMode/Summary.pm b/lib/Vyatta/FirewallOpMode/Summary.pm index 7744291..a466029 100755 --- a/lib/Vyatta/FirewallOpMode/Summary.pm +++ b/lib/Vyatta/FirewallOpMode/Summary.pm @@ -58,16 +58,6 @@ sub show_interfaces_zones { } $outhash->{'zones'} = \@zone_strs; - # check if content-inspection is using this ruleset - my $custom_filter = 0; - my $config = $cfg; - $config->setLevel("content-inspection traffic-filter"); - my $custom_traffic_filter = $config->returnOrigValue('custom'); - if ((defined $custom_traffic_filter) && ($custom_traffic_filter eq $chain)) { - $custom_filter = 1; - $content_str = "Active on all incoming and forwarded traffic for content-inspection"; - } - $outhash->{'content-inspection'} = $content_str; return $outhash; } diff --git a/scripts/firewall/vyatta-show-firewall.pl b/scripts/firewall/vyatta-show-firewall.pl index 5b2c1d6..2c26940 100755 --- a/scripts/firewall/vyatta-show-firewall.pl +++ b/scripts/firewall/vyatta-show-firewall.pl @@ -108,19 +108,8 @@ sub show_interfaces_zones { } } - # check if content-inspection is using this ruleset - my $custom_filter = 0; - my $config = new Vyatta::Config; - $config->setLevel("content-inspection traffic-filter"); - my $custom_traffic_filter = $config->returnOrigValue('custom'); - if ((defined $custom_traffic_filter) && ($custom_traffic_filter eq $chain)) { - $custom_filter = 1; - print "\n Active on all incoming and forwarded traffic for content-inspection\n"; - } - - if ((scalar(@int_strs) == 0) && ($used_in_zonefw == 0) - && ($custom_filter == 0)) { - print "\n Inactive - Not applied to any interfaces, zones or for content-inspection.\n"; + if ((scalar(@int_strs) == 0) && ($used_in_zonefw == 0)) { + print "\n Inactive - Not applied to any interfaces or zones.\n"; } print "\n"; } |