extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 07:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

A little cleanup of messages

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4476 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-29 16:26:04 +00:00
parent 889c81d547
commit 671e5ac94f
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/functions
View File

@ -1781,7 +1781,11 @@ lib_avail() # $1 = Name of the Library
}
#
# Strip the passed file. Return success if a) the stripped file is non-empty; or b) the library had been previously loaded
# Strip the passed file.
#
# Return success if
# a) the stripped file is non-empty and the library was successfully loaded; or
# b) the stripped file is empty but the library had been loaded previously
#
strip_file_and_lib_load() # $1 = logical file name, $2 = library to load if the stripped file is non-empty
{

36
Shorewall/lib.nat
View File

@ -418,19 +418,19 @@ __EOF__
}
if [ -n "$NAT_ENABLED" ]; then
if [ -s $TMP_DIR/masq ]; then
progress_message2 "$DOING Masquerading/SNAT"
save_progress_message "Setting up Masquerading/SNAT..."
fi
while read fullinterface networks addresses proto ports ipsec; do
expandv fullinterface networks addresses proto ports ipsec
if [ -n "$NAT_ENABLED" ]; then
setup_one
else
error_message "WARNING: NAT disabled; masq rule ignored"
fi
done < $TMP_DIR/masq
while read fullinterface networks addresses proto ports ipsec; do
expandv fullinterface networks addresses proto ports ipsec
if [ -n "$NAT_ENABLED" ]; then
setup_one
else
error_message "WARNING: NAT disabled; masq rule ignored"
fi
done < $TMP_DIR/masq
fi
}
#
@ -500,15 +500,17 @@ setup_nat() {
policyout="-m policy --pol none --dir out"
fi
[ -n "$RETAIN_ALIASES" ] || save_progress_message "Setting up one-to-one NAT..."
if [ -s $TMP_DIR/nat ]; then
save_progress_message "Setting up one-to-one NAT..."
while read external interface internal allints localnat; do
expandv external interface internal allints localnat
while read external interface internal allints localnat; do
expandv external interface internal allints localnat
do_one_nat
do_one_nat
progress_message_and_save " Host $internal NAT $external on $interface"
done < $TMP_DIR/nat
progress_message_and_save " Host $internal NAT $external on $interface"
done < $TMP_DIR/nat
fi
}
#