extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-14 19:54:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.17'

Browse Source 
Conflicts:
	Shorewall/Perl/Shorewall/Chains.pm
This commit is contained in:
Tom Eastep 2013-06-02 15:31:45 -07:00
commit d8f53cc0a9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -1122,7 +1122,7 @@ sub merge_rules( $$$ ) {
}
}
for my $option ( grep ! $opttype{$_}, keys %$fromref ) {
for my $option ( grep ! $opttype{$_} || $_ eq 'nfacct', keys %$fromref ) {
set_rule_option( $toref, $option, $fromref->{$option} );
}
@ -1138,6 +1138,10 @@ sub merge_rules( $$$ ) {
set_rule_option( $toref, 'policy', $fromref->{policy} ) if exists $fromref->{policy};
for my $option ( grep( ( $opttype{$_} || 0 ) == EXPENSIVE, keys %$fromref ) ) {
set_rule_option( $toref, $option, $fromref->{$option} );
}
unless ( $toref->{comment} ) {
$toref->{comment} = $fromref->{comment} if exists $fromref->{comment};
}