holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Concatenate match options when not KLUDGEFREE

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-23 15:40:25 -07:00
parent 01d07f55a9
commit 398c843643
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,17 +724,19 @@ sub set_rule_option( $$$ ) {
assert( defined( my $value1 = $ruleref->{$option} ) );
if ( $opttype == MATCH ) {
assert( $globals{KLUDGEFREE} );
if ( $globals{KLUDGEFREE} ) {
unless ( reftype $value1 ) {
unless ( reftype $value ) {
return if $value1 eq $value;
}
unless ( reftype $value1 ) {
unless ( reftype $value ) {
return if $value1 eq $value;
$ruleref->{$option} = [ $ruleref->{$option} ];
}
$ruleref->{$option} = [ $ruleref->{$option} ];
push @{$ruleref->{$option}}, ( reftype $value ? @$value : $value );
} else {
$ruleref->{$option} = join(' ', $value1, $value );
}
push @{$ruleref->{$option}}, ( reftype $value ? @$value : $value );
} elsif ( $opttype == EXCLUSIVE ) {
$ruleref->{$option} .= ",$value";
} elsif ( $opttype == UNIQUE ) {