extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-02 10:59:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Tuomo's params issue

Browse Source
This commit is contained in:
Tom Eastep 2011-03-12 13:07:45 -08:00
parent bd8dc9d381
commit 68b15c9544
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2946,20 +2946,21 @@ sub get_params() {
} }
} }
} }
} elsif ( $params[0] =~ /^export (.*?)="/ ) { } elsif ( $params[0] =~ /^export (.*?)="/ || $params[0] =~ /^export ([^\s=]+)\s*$/ ) {
# #
# getparams interpreted by older (e.g., RHEL 5) Bash # getparams interpreted by older (e.g., RHEL 5) Bash
# #
# - Variable names preceded by 'export ' # - Variable names preceded by 'export '
# - Variable values are delimited by double quotes # - Variable values are delimited by double quotes
# - Embedded single quotes are escaped with '\' # - Embedded single quotes are escaped with '\'
# - Valueless variables ( e.g., 'export foo') are supported
# #
for ( @params ) { for ( @params ) {
if ( /^export (.*?)="(.*[^\\])"$/ ) { if ( /^export (.*?)="(.*[^\\])"$/ ) {
$params{$1} = $2 unless $1 eq '_'; $params{$1} = $2 unless $1 eq '_';
} elsif ( /^export (.*?)="(.*)$/ ) { } elsif ( /^export (.*?)="(.*)$/ ) {
$params{$variable=$1} = $2 eq '"' ? '' : "${2}\n"; $params{$variable=$1} = $2 eq '"' ? '' : "${2}\n";
} elsif ( /^export (.*)\s+$/ || /^export (.*)=""$/ ) { } elsif ( /^export ([^\s=])\s*$/ || /^export (.*)=""$/ ) {
$params{$1} = ''; $params{$1} = '';
} else { } else {
if ($variable) { if ($variable) {