diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 36dca4fe2..c5efd49fd 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -730,6 +730,7 @@ our %eliminated = ( LOGRATE => 1, BLACKLISTNEWONLY => 1, CHAIN_SCRIPTS => 1, MODULE_SUFFIX => 1, + MAPOLDACTIONS => 1, ); # # Variables involved in ?IF, ?ELSE ?ENDIF processing @@ -937,7 +938,6 @@ sub initialize( $;$$$) { MACLIST_TTL => undef, SAVE_IPSETS => undef, SAVE_ARPTABLES => undef, - MAPOLDACTIONS => undef, FASTACCEPT => undef, IMPLICIT_CONTINUE => undef, IPSET_WARNINGS => undef, @@ -6391,7 +6391,6 @@ sub get_configuration( $$$$ ) { default_yes_no 'SAVE_ARPTABLES' , ''; default_yes_no 'STARTUP_ENABLED' , 'Yes'; default_yes_no 'DELAYBLACKLISTLOAD' , ''; - default_yes_no 'MAPOLDACTIONS' , 'Yes'; warning_message 'DELAYBLACKLISTLOAD=Yes is not supported by Shorewall ' . $globals{VERSION} if $config{DELAYBLACKLISTLOAD}; diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 7baaf7968..005fee209 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1714,34 +1714,6 @@ sub isolate_basic_target( $ ) { $target =~ /^(\w+)[(].*[)]$/ ? $1 : $target; } -# -# Map pre-3.0 actions to the corresponding Macro invocation -# - -sub find_old_action ( $$$ ) { - my ( $target, $macro, $param ) = @_; - - if ( my $actiontype = find_macro( $macro ) ) { - ( $macro, $actiontype , $param ); - } else { - ( $target, 0, '' ); - } -} - -sub map_old_actions( $ ) { - my $target = shift; - - if ( $target =~ /^Allow(.*)$/ ) { - find_old_action( $target, $1, 'ACCEPT' ); - } elsif ( $target =~ /^Drop(.*)$/ ) { - find_old_action( $target, $1, 'DROP' ); - } elsif ( $target = /^Reject(.*)$/ ) { - find_old_action( $target, $1, 'REJECT' ); - } else { - ( $target, 0, '' ); - } -} - sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ); sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$$ ); sub process_snat1( $$$$$$$$$$$$ ); @@ -2630,10 +2602,6 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) { # $actiontype = $targets{$basictarget} || find_macro( $basictarget ); - if ( $config{ MAPOLDACTIONS } ) { - ( $basictarget, $actiontype , $param ) = map_old_actions( $basictarget ) unless $actiontype || supplied $param; - } - fatal_error "Unknown ACTION ($action)" unless $actiontype; $usergenerated = $actiontype & IPTABLES; diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf index ccb843668..713ceb2f4 100644 --- a/Shorewall/Samples/Universal/shorewall.conf +++ b/Shorewall/Samples/Universal/shorewall.conf @@ -199,8 +199,6 @@ MACLIST_TTL= MANGLE_ENABLED=Yes -MAPOLDACTIONS=No - MINIUPNPD=No MARK_IN_FORWARD_CHAIN=No diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf index 734514de2..68cf3feda 100644 --- a/Shorewall/Samples/one-interface/shorewall.conf +++ b/Shorewall/Samples/one-interface/shorewall.conf @@ -210,8 +210,6 @@ MACLIST_TTL= MANGLE_ENABLED=Yes -MAPOLDACTIONS=No - MINIUPNPD=No MARK_IN_FORWARD_CHAIN=No diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf index 12505f56a..c193252a8 100644 --- a/Shorewall/Samples/three-interfaces/shorewall.conf +++ b/Shorewall/Samples/three-interfaces/shorewall.conf @@ -207,8 +207,6 @@ MACLIST_TTL= MANGLE_ENABLED=Yes -MAPOLDACTIONS=No - MINIUPNPD=No MARK_IN_FORWARD_CHAIN=No diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf index 5bccdc45c..3c375a365 100644 --- a/Shorewall/Samples/two-interfaces/shorewall.conf +++ b/Shorewall/Samples/two-interfaces/shorewall.conf @@ -210,8 +210,6 @@ MACLIST_TTL= MANGLE_ENABLED=Yes -MAPOLDACTIONS=No - MINIUPNPD=No MARK_IN_FORWARD_CHAIN=No diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 716e8248d..ddef7afe0 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -199,8 +199,6 @@ MACLIST_TTL= MANGLE_ENABLED=Yes -MAPOLDACTIONS=No - MARK_IN_FORWARD_CHAIN=No MINIUPNPD=No diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index e69964d18..54ff25cee 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -1810,19 +1810,6 @@ LOG:info:,bar net fw - - MAPOLDACTIONS=[Yes|No] - - - IPv4 only. - - This option is included for compatibility with old Shorewall - configuration. New installs should always have - MAPOLDACTIONS=No. - - - MINIUPNPD=[Yes|No]