extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 17:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement MAPOLDACTIONS=Yes

Browse Source
This commit is contained in:
Tom Eastep 2009-09-06 13:37:24 -07:00
parent 477c0ef9e8
commit 70ebe17cb3
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Shorewall/Perl/Shorewall/Actions.pm
View File

@ -265,6 +265,30 @@ sub add_requiredby ( $$ ) {
$actions{$requires}{requires}{$requiredby} = 1; $actions{$requires}{requires}{$requiredby} = 1;
} }
#
# Map pre-3.0 actions to the corresponding Macro invocation
#
sub map_old_actions( $ ) {
my $target = shift;
my $macro;
my $param;
if ( $target =~ /^Allow(.*)$/ ) {
$macro = $1;
$param = 'ACCEPT';
} elsif ( $target =~ /^Drop(.*)$/ ) {
$macro = $1;
$param = 'DROP';
} elsif ( $target = /^Reject(.*)$/ ) {
$macro = $1;
$param = 'REJECT';
} else {
return ( $target, 0, '' );
}
( $macro, find_macro( $macro ) , $param );
}
# #
# Create and record a log action chain -- Log action chains have names # Create and record a log action chain -- Log action chains have names
# that are formed from the action name by prepending a "%" and appending # that are formed from the action name by prepending a "%" and appending

2
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2356,11 +2356,11 @@ sub get_configuration( $ ) {
unsupported_yes_no_warning 'DYNAMIC_ZONES'; unsupported_yes_no_warning 'DYNAMIC_ZONES';
unsupported_yes_no 'BRIDGING'; unsupported_yes_no 'BRIDGING';
unsupported_yes_no_warning 'SAVE_IPSETS'; unsupported_yes_no_warning 'SAVE_IPSETS';
unsupported_yes_no 'MAPOLDACTIONS';
unsupported_yes_no_warning 'RFC1918_STRICT'; unsupported_yes_no_warning 'RFC1918_STRICT';
default_yes_no 'STARTUP_ENABLED' , 'Yes'; default_yes_no 'STARTUP_ENABLED' , 'Yes';
default_yes_no 'DELAYBLACKLISTLOAD' , ''; default_yes_no 'DELAYBLACKLISTLOAD' , '';
default_yes_no 'MAPOLDACTIONS' , 'Yes';
warning_message 'DELAYBLACKLISTLOAD=Yes is not supported by Shorewall ' . $globals{VERSION} if $config{DELAYBLACKLISTLOAD}; warning_message 'DELAYBLACKLISTLOAD=Yes is not supported by Shorewall ' . $globals{VERSION} if $config{DELAYBLACKLISTLOAD};

4
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -959,6 +959,10 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
# #
my $actiontype = $targets{$basictarget} || find_macro( $basictarget ); my $actiontype = $targets{$basictarget} || find_macro( $basictarget );
if ( $config{ MAPOLDACTIONS } ) {
( $basictarget, $actiontype , $param ) = map_old_actions( $basictarget ) unless ( $actiontype || $param );
}
fatal_error "Unknown action ($action)" unless $actiontype; fatal_error "Unknown action ($action)" unless $actiontype;
if ( $actiontype == MACRO ) { if ( $actiontype == MACRO ) {

2
Shorewall/changelog.txt
View File

@ -9,6 +9,8 @@ Changes in Shorewall 4.4.2
4) Let the Actions module add the builtin actions to 4) Let the Actions module add the builtin actions to
%Shorewall::Chains::targets. Much better modularization that way. %Shorewall::Chains::targets. Much better modularization that way.
5) Some changes to mmake Lenny->Squeeze less painful.
Changes in Shorewall 4.4.1 Changes in Shorewall 4.4.1
1) Deleted extra 'use ...IPAddrs.pm' from Nat.pm. 1) Deleted extra 'use ...IPAddrs.pm' from Nat.pm.

20
docs/LennyToSqueeze.xml
View File

@ -249,26 +249,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>MAPOLDACTIONS</term>
<listitem>
<para>If you have set this option to Yes, you will receive the
following error.</para>
<para><emphasis role="bold">ERROR: MAPOLDACTIONS=Yes is not
supported by Shorewall 4.4.x</emphasis></para>
<para>Only the very oldest of configurations should receive this
error. If your configuration is that old, this might be a good
time to reconfigure from scratch.</para>
<para>The alternative is to change your
<filename>/etc/shorewall/rules</filename> file as described in the
Shorewall 3.0.0 upgrade issues from 2005.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term>RFC1918_LOG_LEVEL</term> <term>RFC1918_LOG_LEVEL</term>