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

Merge branch '4.4.21'

Browse Source
This commit is contained in:
Tom Eastep 2011-07-03 08:48:27 -07:00
commit 24deabb03f
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1609,7 +1609,7 @@ sub ensure_audit_chain( $;$$ ) {
sub require_audit($$;$) { sub require_audit($$;$) {
my ($action, $audit, $tgt ) = @_; my ($action, $audit, $tgt ) = @_;
return $action unless supplied $audit; return $action unless supplied $audit && $audit ne '-';
my $target = 'A_' . $action; my $target = 'A_' . $action;

11
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1835,7 +1835,7 @@ sub default_action_params {
for ( $i = 1; 1; $i++ ) { for ( $i = 1; 1; $i++ ) {
last unless defined ( $val = shift ); last unless defined ( $val = shift );
my $curval = $actparms[$i]; my $curval = $actparms[$i];
$actparms[$i] =$val eq '-' ? '' : $val eq '--' ? '-' : $val unless supplied( $curval ); $actparms[$i] =$val unless supplied( $curval );
} }
fatal_error "Too Many arguments to action $action" if defined $actparms[$i]; fatal_error "Too Many arguments to action $action" if defined $actparms[$i];
@ -1846,7 +1846,14 @@ sub get_action_params( $ ) {
fatal_error "Invalid argument to get_action_params()" unless $num =~ /^\d+$/ && $num > 0; fatal_error "Invalid argument to get_action_params()" unless $num =~ /^\d+$/ && $num > 0;
@actparms[1..$num]; my @return;
for ( my $i = 1; $i <= $num; $i++ ) {
my $val = $actparms[$i];
push @return, defined $val ? $val eq '-' ? '' : $val eq '--' ? '-' : $val : $val;
}
@return;
} }
sub get_action_chain() { sub get_action_chain() {

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

@ -842,6 +842,7 @@ sub normalize_action( $$$ ) {
$level = 'none' unless supplied $level; $level = 'none' unless supplied $level;
$tag = '' unless defined $tag; $tag = '' unless defined $tag;
$param = '' unless defined $param; $param = '' unless defined $param;
$param = '' if $param eq '-';
join( ':', $action, $level, $tag, $param ); join( ':', $action, $level, $tag, $param );
} }

10
Shorewall/action.Drop
View File

@ -43,12 +43,12 @@ my ( $p1, $p2, $p3 , $p4, $p5 ) = get_action_params( 5 );
if ( defined $p1 ) { if ( defined $p1 ) {
if ( $p1 eq 'audit' ) { if ( $p1 eq 'audit' ) {
set_action_param( 2, 'A_REJECT') unless defined( $p2 ) && $p2 ne '-'; set_action_param( 2, 'A_REJECT') unless supplied $p2;
set_action_param( 3, 'A_DROP') unless defined( $p3 ) && $p3 ne '-'; set_action_param( 3, 'A_DROP') unless supplied $p3;
set_action_param( 4, 'A_ACCEPT' ) unless defined( $p4 ) && $p4 ne '-'; set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4;
set_action_param( 5, 'A_DROP' ) unless defined( $p5 ) && $p5 ne '-'; set_action_param( 5, 'A_DROP' ) unless supplied $p5;
} else { } else {
fatal_error "Invalid value ($p1) for first Drop parameter" unless $p1 eq '-'; fatal_error "Invalid value ($p1) for first Drop parameter" if supplied $p1;
} }
} }

10
Shorewall/action.Reject
View File

@ -39,12 +39,12 @@ my ( $p1, $p2, $p3 , $p4, $p5 ) = get_action_params( 5 );
if ( defined $p1 ) { if ( defined $p1 ) {
if ( $p1 eq 'audit' ) { if ( $p1 eq 'audit' ) {
set_action_param( 2, 'A_REJECT') unless defined( $p2 ) && $p2 ne '-'; set_action_param( 2, 'A_REJECT') unless supplied $p2;
set_action_param( 3, 'A_REJECT') unless defined( $p3 ) && $p3 ne '-'; set_action_param( 3, 'A_REJECT') unless supplied $p3;
set_action_param( 4, 'A_ACCEPT' ) unless defined( $p5 ) && $p4 ne '-'; set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4;
set_action_param( 5, 'A_DROP' ) unless defined( $p5 ) && $p5 ne '-'; set_action_param( 5, 'A_DROP' ) unless supplied $p5;
} else { } else {
fatal_error "Invalid value ($p1) for first Reject parameter" unless $p1 eq '-'; fatal_error "Invalid value ($p1) for first Reject parameter" if supplied $p1;
} }
} }