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

Don't add trailing whitespace to DNAT/REDIRECT target

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-09-28 09:27:42 -07:00
parent 468c918121
commit 47fbc83419
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,7 +1134,7 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
$dest = $2; $dest = $2;
} elsif ( $dest =~ /.*\..*\./ ) { } elsif ( $dest =~ /.*\..*\./ ) {
# #
# Appears to be an address # Appears to be an IPv4 address (no NAT in IPv6)
# #
$destzone = '-'; $destzone = '-';
} else { } else {
@ -1256,7 +1256,7 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
# #
if ( $actiontype & NATRULE ) { if ( $actiontype & NATRULE ) {
my ( $server, $serverport ); my ( $server, $serverport );
my $randomize = $dest =~ s/:random$// ? '--random ' : ''; my $randomize = $dest =~ s/:random$// ? ' --random' : '';
require_capability( 'NAT_ENABLED' , "$basictarget rules", '' ); require_capability( 'NAT_ENABLED' , "$basictarget rules", '' );
# #
@ -1307,8 +1307,8 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
if ( $actiontype & REDIRECT ) { if ( $actiontype & REDIRECT ) {
fatal_error "A server IP address may not be specified in a REDIRECT rule" if $server; fatal_error "A server IP address may not be specified in a REDIRECT rule" if $server;
$target = 'REDIRECT '; $target = 'REDIRECT';
$target .= "--to-port $serverport " if $serverport; $target .= " --to-port $serverport" if $serverport;
if ( $origdest eq '' || $origdest eq '-' ) { if ( $origdest eq '' || $origdest eq '-' ) {
$origdest = ALLIP; $origdest = ALLIP;
} elsif ( $origdest eq 'detect' ) { } elsif ( $origdest eq 'detect' ) {
@ -1331,14 +1331,14 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
} }
if ( $action eq 'DNAT' ) { if ( $action eq 'DNAT' ) {
$target = 'DNAT '; $target = 'DNAT';
if ( $server ) { if ( $server ) {
$serverport = ":$serverport" if $serverport; $serverport = ":$serverport" if $serverport;
for my $serv ( split /,/, $server ) { for my $serv ( split /,/, $server ) {
$target .= "--to-destination ${serv}${serverport} "; $target .= " --to-destination ${serv}${serverport}";
} }
} else { } else {
$target .= "--to-destination :$serverport "; $target .= " --to-destination :$serverport";
} }
} }