From 040fd9b92e80b84417e4be8a18bf57f33dd88464 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 31 Mar 2007 22:03:16 +0000 Subject: [PATCH] A couple of cosmetic changes git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5775 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- New/Shorewall/Common.pm | 1 - New/Shorewall/Config.pm | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/New/Shorewall/Common.pm b/New/Shorewall/Common.pm index 826893e43..7935bb2bb 100644 --- a/New/Shorewall/Common.pm +++ b/New/Shorewall/Common.pm @@ -316,7 +316,6 @@ END { close $object; unlink $tempfile; } - } 1; diff --git a/New/Shorewall/Config.pm b/New/Shorewall/Config.pm index dbf42a8d1..05ee09e67 100644 --- a/New/Shorewall/Config.pm +++ b/New/Shorewall/Config.pm @@ -772,7 +772,7 @@ sub generate_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) { conditionally_add_option $option; @@ -787,9 +787,7 @@ sub generate_aux_config() { END { if ( $tmp_dir ) { my $exitstatus = $?; #Changed by system() - system "rm -rf $tmp_dir"; - $? = $exitstatus; } }