holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fully qualify file name in a couple of messages; simplify some really silly code in the compiler

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4187 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-30 21:00:59 +00:00
parent 3db2166e12
commit 7b8ea6ba02
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shorewall/compiler
View File

@ -8425,19 +8425,19 @@ __EOF__
setup_masq $masq
fi
tos=$(find_file tos)
if [ -f $tos -a -n "$MANGLE_ENABLED" ]; then
save_progress_message "Setting up TOS..."
process_tos $tos
fi
ecn=$(find_file ecn)
if [ -f $ecn -a -n "$MANGLE_ENABLED" ]; then
save_progress_message "Setting up ECN..."
setup_ecn $ecn
fi
if [ -n "$MANGLE_ENABLED" ]; then
tos=$(find_file tos)
if [ -f $tos ]; then
save_progress_message "Setting up TOS..."
process_tos $tos
fi
ecn=$(find_file ecn)
if [ -f $ecn ]; then
save_progress_message "Setting up ECN..."
setup_ecn $ecn
fi
save_progress_message "Setting up TC Rules..."
setup_tc
fi
@ -8536,7 +8536,7 @@ __EOF__
INDENT=
cat $(find_file prog.header) $OUTPUT $(find_file prog.footer) > $outfile
chmod 700 $outfile
progress_message3 "Shorewall configuration compiled to $outfile"
progress_message3 "Shorewall configuration compiled to $(resolve_file $outfile)"
rm -f $OUTPUT
fi

2
Shorewall/shorewall
View File

@ -1308,7 +1308,7 @@ reload_command()
[ -n "$LITEDIR" ] || { echo " ERROR: LITEDIR not defined in ${SHAREDIR}/configpath" >&2; exit 2; }
if shorewall $debugging $verbose compile -e $1 $1/firewall && \
echo "Copying ${1}/firewall to ${2}:${LITEDIR}..." && \
echo "Copying $(resolve_file ${1}/firewall) to ${2}:${LITEDIR}..." && \
scp $1/firewall root@${2}:${LITEDIR}
then
echo "Copy complete"