Second fix for .safe

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5022 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/changelog.txt

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

Shorewall/lib.cli

@@ -267,10 +267,12 @@ save_config() {
 	    echo "   ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration"
 	else
 	    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"
 		    ;;
 		*)
+		    validate_restorefile RESTOREFILE
+
 		    if $IPTABLES -L dynamic -n > ${VARDIR}/save; then
 			echo "   Dynamic Rules Saved"
 			if [ -f ${VARDIR}/.restore ]; then

Shorewall/releasenotes.txt

@@ -39,6 +39,9 @@ Problems Corrected in 3.3.6
     then the compiled script attempts to restore the ipsets from that
     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
 
 1)  Now that the manpages are in place, /etc/shorewall/Documentation