From ff82e98c78b3f60d03b313e295a0d8442f44cf34 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 27 Nov 2007 15:50:20 +0000 Subject: [PATCH] Back out verbose fix for undefined value on missing file git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7772 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Accounting.pm | 2 +- Shorewall-perl/Shorewall/Nat.pm | 6 +++--- Shorewall-perl/Shorewall/Rules.pm | 10 +++++----- Shorewall-perl/Shorewall/Tunnels.pm | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm index 7dc95d8a3..4b4b8cf6b 100644 --- a/Shorewall-perl/Shorewall/Accounting.pm +++ b/Shorewall-perl/Shorewall/Accounting.pm @@ -176,7 +176,7 @@ sub setup_accounting() { my $fn = open_file 'accounting'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) { diff --git a/Shorewall-perl/Shorewall/Nat.pm b/Shorewall-perl/Shorewall/Nat.pm index eae672343..c0cfa1f5e 100644 --- a/Shorewall-perl/Shorewall/Nat.pm +++ b/Shorewall-perl/Shorewall/Nat.pm @@ -307,7 +307,7 @@ sub setup_masq() { my $fn = open_file 'masq'; - first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } ) if $fn; + first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } ); while ( read_a_line ) { @@ -412,7 +412,7 @@ sub setup_nat() { my $fn = open_file 'nat'; - first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } ) if $fn; + first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } ); while ( read_a_line ) { @@ -436,7 +436,7 @@ sub setup_netmap() { my $fn = open_file 'netmap'; - first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } ) if $fn; + first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } ); while ( read_a_line ) { diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index f58a66bc7..a34d5d614 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -221,7 +221,7 @@ sub setup_rfc1918_filteration( $ ) { my $fn = open_file 'rfc1918'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) { @@ -341,7 +341,7 @@ sub process_criticalhosts() { my $fn = open_file 'routestopped'; - first_entry "$doing $fn for critical hosts..." if $fn; + first_entry "$doing $fn for critical hosts..."; while ( read_a_line ) { @@ -382,7 +382,7 @@ sub process_routestopped() { my $fn = open_file 'routestopped'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) { @@ -702,7 +702,7 @@ sub setup_mac_lists( $ ) { my $fn = open_file 'maclist'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) { @@ -1349,7 +1349,7 @@ sub process_rules() { my $fn = open_file 'rules'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) { diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm index 7d736a4de..0ca265741 100644 --- a/Shorewall-perl/Shorewall/Tunnels.pm +++ b/Shorewall-perl/Shorewall/Tunnels.pm @@ -270,7 +270,7 @@ sub setup_tunnels() { # my $fn = open_file 'tunnels'; - first_entry "$doing $fn..." if $fn; + first_entry "$doing $fn..."; while ( read_a_line ) {