diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 3a221a6c1..91c8bbd2f 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -2673,7 +2673,6 @@ sub initialize_chain_table($) { for my $chain ( qw(OUTPUT PREROUTING) ) { new_builtin_chain( 'raw', $chain, 'ACCEPT' )->{insert} = 0; - } new_builtin_chain 'rawpost', 'POSTROUTING', 'ACCEPT'; @@ -7264,7 +7263,7 @@ sub emitr( $$ ) { # sub enter_cat_mode1() { print "\n"; - emitstd "cat << __EOF__"; + emitstd "cat << __EOF__ >&3"; $mode = CAT_MODE; } diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 89c2d8341..b6eac6b83 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -793,13 +793,10 @@ sub compiler { # (Produces no output to the compiled script -- rules are stored in the chain table) # process_tos; - - if ( $family == F_IPV4 ) { - # - # ECN - # - setup_ecn if have_capability( 'MANGLE_ENABLED' ) && $config{MANGLE_ENABLED}; - } + # + # ECN + # + setup_ecn if $family == F_IPV4 && have_capability( 'MANGLE_ENABLED' ) && $config{MANGLE_ENABLED}; # # Setup Masquerading/SNAT #