From 3d06e0682b5d7eacdf8b2cb937b1da771eb25093 Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 29 Mar 2007 01:18:50 +0000 Subject: [PATCH] Reorder some progress messages and capability tests git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5737 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- New/compiler.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/New/compiler.pl b/New/compiler.pl index da9a80ba7..57f17923b 100755 --- a/New/compiler.pl +++ b/New/compiler.pl @@ -734,8 +734,8 @@ sub compiler( $ ) { # Setup Masquerading/SNAT # if ( -s "$ENV{TMP_DIR}/masq" ) { - require_capability( 'NAT_ENABLED' , 'a non-empty masq file' ); progress_message2 "$doing Masq file..."; + require_capability( 'NAT_ENABLED' , 'a non-empty masq file' ); setup_masq; } # @@ -772,16 +772,16 @@ sub compiler( $ ) { # Setup Nat # if ( -s "$ENV{TMP_DIR}/nat" ) { - require_capability( 'NAT_ENABLED' , 'a non-empty nat file' ); progress_message2 "$doing one-to-one NAT..."; + require_capability( 'NAT_ENABLED' , 'a non-empty nat file' ); setup_nat; } # # Setup NETMAP # if ( -s "$ENV{TMP_DIR}/nat" ) { - require_capability( 'NAT_ENABLED' , 'a non-empty netmap file' ); progress_message2 "$doing NETMAP..."; + require_capability( 'NAT_ENABLED' , 'a non-empty netmap file' ); setup_netmap; } #