mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
A couple of cosmetic changes
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5775 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
b1587a7b1f
commit
040fd9b92e
@ -316,7 +316,6 @@ END {
|
|||||||
close $object;
|
close $object;
|
||||||
unlink $tempfile;
|
unlink $tempfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
@ -772,7 +772,7 @@ sub generate_aux_config() {
|
|||||||
|
|
||||||
create_temp_aux_config;
|
create_temp_aux_config;
|
||||||
|
|
||||||
emit( "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version " . $globals{VERSION} . ' - ' . ( localtime ) . "\n#" );
|
emit join ( '', "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version ", $globals{VERSION}, ' - ' , localtime , "\n#" );
|
||||||
|
|
||||||
for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS) {
|
for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS) {
|
||||||
conditionally_add_option $option;
|
conditionally_add_option $option;
|
||||||
@ -787,9 +787,7 @@ sub generate_aux_config() {
|
|||||||
END {
|
END {
|
||||||
if ( $tmp_dir ) {
|
if ( $tmp_dir ) {
|
||||||
my $exitstatus = $?; #Changed by system()
|
my $exitstatus = $?; #Changed by system()
|
||||||
|
|
||||||
system "rm -rf $tmp_dir";
|
system "rm -rf $tmp_dir";
|
||||||
|
|
||||||
$? = $exitstatus;
|
$? = $exitstatus;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user