extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-30 11:33:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove superfluous variables from generated script

Browse Source
This commit is contained in:
Tom Eastep 2009-10-19 07:25:03 -07:00
parent 65e4a5ff66
commit abc9ab061a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -213,8 +213,7 @@ sub generate_script_2() {
emit ( '[ -n "${COMMAND:=restart}" ]', emit ( '[ -n "${COMMAND:=restart}" ]',
'[ -n "${VERBOSE:=0}" ]', '[ -n "${VERBOSE:=0}" ]',
qq([ -n "\${RESTOREFILE:=$config{RESTOREFILE}}" ]), qq([ -n "\${RESTOREFILE:=$config{RESTOREFILE}}" ]) );
'[ -n "$LOGFORMAT" ] || LOGFORMAT="Shorewall:%s:%s:"' );
emit ( qq(VERSION="$globals{VERSION}") ) unless $test; emit ( qq(VERSION="$globals{VERSION}") ) unless $test;

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

@ -188,8 +188,7 @@ our %config;
# #
# Config options and global settings that are to be copied to output script # Config options and global settings that are to be copied to output script
# #
our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX LOGFORMAT SUBSYSLOCK LOCKFILE /; our @propagateconfig = qw/ DISABLE_IPV6 MODULESDIR MODULE_SUFFIX SUBSYSLOCK /;
our @propagateenv = qw/ LOGLIMIT LOGTAGONLY LOGRULENUMBERS /;
# #
# From parsing the capabilities file or detecting capabilities # From parsing the capabilities file or detecting capabilities
# #
@ -2539,11 +2538,6 @@ sub propagateconfig() {
my $value = $config{$option} || ''; my $value = $config{$option} || '';
emit "$option=\"$value\""; emit "$option=\"$value\"";
} }
for my $option ( @propagateenv ) {
my $value = $globals{$option} || '';
emit "$option=\"$value\"";
}
} }
# #

4
Shorewall/changelog.txt
View File

@ -12,6 +12,10 @@ Changes in Shorewall 4.4.3
6) Fix nested zones. 6) Fix nested zones.
7) Move all function declarations from prog.footer to prog.header
8) Remove superfluous variables from generated script
Changes in Shorewall 4.4.2 Changes in Shorewall 4.4.2
1) BUGFIX: Correct detection of Persistent SNAT support 1) BUGFIX: Correct detection of Persistent SNAT support