mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-26 04:32:01 +02:00
Reorder some progress messages and capability tests
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5737 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
8fc53b3277
commit
3d06e0682b
@ -734,8 +734,8 @@ sub compiler( $ ) {
|
|||||||
# Setup Masquerading/SNAT
|
# Setup Masquerading/SNAT
|
||||||
#
|
#
|
||||||
if ( -s "$ENV{TMP_DIR}/masq" ) {
|
if ( -s "$ENV{TMP_DIR}/masq" ) {
|
||||||
require_capability( 'NAT_ENABLED' , 'a non-empty masq file' );
|
|
||||||
progress_message2 "$doing Masq file...";
|
progress_message2 "$doing Masq file...";
|
||||||
|
require_capability( 'NAT_ENABLED' , 'a non-empty masq file' );
|
||||||
setup_masq;
|
setup_masq;
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
@ -772,16 +772,16 @@ sub compiler( $ ) {
|
|||||||
# Setup Nat
|
# Setup Nat
|
||||||
#
|
#
|
||||||
if ( -s "$ENV{TMP_DIR}/nat" ) {
|
if ( -s "$ENV{TMP_DIR}/nat" ) {
|
||||||
require_capability( 'NAT_ENABLED' , 'a non-empty nat file' );
|
|
||||||
progress_message2 "$doing one-to-one NAT...";
|
progress_message2 "$doing one-to-one NAT...";
|
||||||
|
require_capability( 'NAT_ENABLED' , 'a non-empty nat file' );
|
||||||
setup_nat;
|
setup_nat;
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
# Setup NETMAP
|
# Setup NETMAP
|
||||||
#
|
#
|
||||||
if ( -s "$ENV{TMP_DIR}/nat" ) {
|
if ( -s "$ENV{TMP_DIR}/nat" ) {
|
||||||
require_capability( 'NAT_ENABLED' , 'a non-empty netmap file' );
|
|
||||||
progress_message2 "$doing NETMAP...";
|
progress_message2 "$doing NETMAP...";
|
||||||
|
require_capability( 'NAT_ENABLED' , 'a non-empty netmap file' );
|
||||||
setup_netmap;
|
setup_netmap;
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user