Merge branch '4.5.1'

This commit is contained in:
Tom Eastep 2012-03-19 10:13:08 -07:00
commit f104596b39

View File

@ -3571,8 +3571,10 @@ sub get_params() {
} }
for ( keys %params ) { for ( keys %params ) {
fatal_error "The variable name $_ is reserved and may not be set in the params file" unless ( $_ eq 'SHOREWALL_INIT_SCRIPT' ) {
if /^SW_/ || /^SHOREWALL_/ || ( exists $config{$_} && ! exists $ENV{$_} ) || exists $reserved{$_}; fatal_error "The variable name $_ is reserved and may not be set in the params file"
if /^SW_/ || /^SHOREWALL_/ || ( exists $config{$_} && ! exists $ENV{$_} ) || exists $reserved{$_};
}
} }
if ( $debug ) { if ( $debug ) {