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

Merge branch 'master' into 5.1.0

Browse Source
This commit is contained in:
Tom Eastep 2016-12-02 15:27:16 -08:00
commit 7ceb0228e9
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1218,6 +1218,7 @@ sub merge_rules( $$$ ) {
if ( exists $fromref->{$option} ) { if ( exists $fromref->{$option} ) {
push( @{$toref->{matches}}, $option ) unless exists $toref->{$option}; push( @{$toref->{matches}}, $option ) unless exists $toref->{$option};
$toref->{$option} = $fromref->{$option}; $toref->{$option} = $fromref->{$option};
$toref->{simple} = 0;
} }
} }