Second fix for .safe

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5022 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-30 00:23:33 +00:00
parent 65bfa41c0a
commit 0ca8d0281c
3 changed files with 9 additions and 2 deletions

View File

@ -10,6 +10,8 @@ Changes in 3.3.6
5) Use multiport match in tcrules. 5) Use multiport match in tcrules.
6) Fix safe- commands.
Changes in 3.3.5 Changes in 3.3.5
1) Restore default route when there are no 'balance' providers. 1) Restore default route when there are no 'balance' providers.

View File

@ -267,10 +267,12 @@ save_config() {
echo " ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration" echo " ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration"
else else
case $RESTOREFILE in case $RESTOREFILE in
.*|capabilities|chains|default_route|firewall|firewall.conf|nat|proxyarp|restarted|rt_tables|save|state|undo_routing|zones) capabilities|chains|default_route|firewall|firewall.conf|nat|proxyarp|restarted|rt_tables|save|state|undo_routing|zones)
echo " ERROR: Reserved file name: $RESTOREFILE" echo " ERROR: Reserved file name: $RESTOREFILE"
;; ;;
*) *)
validate_restorefile RESTOREFILE
if $IPTABLES -L dynamic -n > ${VARDIR}/save; then if $IPTABLES -L dynamic -n > ${VARDIR}/save; then
echo " Dynamic Rules Saved" echo " Dynamic Rules Saved"
if [ -f ${VARDIR}/.restore ]; then if [ -f ${VARDIR}/.restore ]; then

View File

@ -37,7 +37,10 @@ Problems Corrected in 3.3.6
used on a system running Shorewall Lite. If there is a file named used on a system running Shorewall Lite. If there is a file named
'ipsets' on the CONFIG_PATH when the firewall script is compiled, 'ipsets' on the CONFIG_PATH when the firewall script is compiled,
then the compiled script attempts to restore the ipsets from that then the compiled script attempts to restore the ipsets from that
file (which may not exist on the firewall system). file (which may not exist on the firewall system).
2) Previously, "shorewall safe-[re]start" was badly broken. This
breakage had been corrected.
Other Changes in 3.3.6 Other Changes in 3.3.6