No need to import FW

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5797 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-01 19:48:20 +00:00
parent 40a270fcd0
commit 7b3af346e8
3 changed files with 2 additions and 3 deletions

View File

@ -628,8 +628,7 @@ sub determine_capabilities() {
system( "$iptables -F fooX1234 > /dev/null 2>&1" ); system( "$iptables -F fooX1234 > /dev/null 2>&1" );
system( "$iptables -X fooX1234 > /dev/null 2>&1" ); system( "$iptables -X fooX1234 > /dev/null 2>&1" );
} }
sub require_capability( $$ ) { sub require_capability( $$ ) {
my ( $capability, $description ) = @_; my ( $capability, $description ) = @_;

View File

@ -225,6 +225,7 @@ sub determine_zones()
fatal_error 'Firewall zone may not be nested' if @parents; fatal_error 'Firewall zone may not be nested' if @parents;
fatal_error "Only one firewall zone may be defined: $zone" if $firewall_zone; fatal_error "Only one firewall zone may be defined: $zone" if $firewall_zone;
$firewall_zone = $zone; $firewall_zone = $zone;
$ENV{FW} = $zone;
$zoneref->{type} = "firewall"; $zoneref->{type} = "firewall";
} elsif ( $type eq '-' ) { } elsif ( $type eq '-' ) {
$type = $zoneref->{type} = 'ipv4'; $type = $zoneref->{type} = 'ipv4';

View File

@ -32,7 +32,6 @@
# SHOREWALL_DIR A directory name was passed to /sbin/shorewall # SHOREWALL_DIR A directory name was passed to /sbin/shorewall
# VERBOSE Standard Shorewall verbosity control. # VERBOSE Standard Shorewall verbosity control.
# TIMESTAMP=Yes -t option specified to /sbin/shorewall # TIMESTAMP=Yes -t option specified to /sbin/shorewall
# FW Firewall zone (for shell-variable expansion).
# #
# This program performs rudimentary shell variable expansion on action and macro files. # This program performs rudimentary shell variable expansion on action and macro files.