Remove dependence of Shorewall::Rules on Scalar::Util

This commit is contained in:
Tom Eastep 2009-11-03 07:40:06 -08:00
parent 1892160ed5
commit c893ba6ffa

View File

@ -25,7 +25,6 @@
package Shorewall::Rules; package Shorewall::Rules;
require Exporter; require Exporter;
use Scalar::Util 'reftype';
use Shorewall::Config qw(:DEFAULT :internal); use Shorewall::Config qw(:DEFAULT :internal);
use Shorewall::IPAddrs; use Shorewall::IPAddrs;
use Shorewall::Zones; use Shorewall::Zones;
@ -1998,7 +1997,7 @@ sub generate_matrix() {
my $match_source_dev = ''; my $match_source_dev = '';
my $forwardchainref = $filter_table->{forward_chain $interface}; my $forwardchainref = $filter_table->{forward_chain $interface};
if ( use_forward_chain $interface || ( @{$forwardchainref->{rules} } && ! reftype $chainref ) ) { if ( use_forward_chain $interface || ( @{$forwardchainref->{rules} } && ! $chainref ) ) {
# #
# Either we must use the interface's forwarding chain or that chain has rules and we have nowhere to move them # Either we must use the interface's forwarding chain or that chain has rules and we have nowhere to move them
# #