From 21cfe437d07794be24ce80f6b17fb5f6ceaea1f3 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 18 Jan 2006 01:42:24 +0000
Subject: [PATCH] More compiled-program tweaks

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3313 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall    | 9 ++++++++-
 Shorewall/prog.footer | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 06949ed85..8518d3ee2 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -2206,7 +2206,7 @@ clear_firewall() {
 
     echo 1 > /proc/sys/net/ipv4/ip_forward
 
-    if qt mywhich ip6tables; then
+    if [ -n "$DISABLE_IPV6" ] && qt mywhich ip6tables; then
 	ip6tables -P INPUT   ACCEPT 2> /dev/null
 	ip6tables -P OUTPUT  ACCEPT 2> /dev/null
 	ip6tables -P FORWARD ACCEPT 2> /dev/null
@@ -9325,12 +9325,19 @@ clear_firewall() {
 
     echo 1 > /proc/sys/net/ipv4/ip_forward
 
+__EOF__
+    if [ -n "$DISABLE_IPV6" ]; then
+	cat >> $RESTOREBASE << __EOF__
     if qt mywhich ip6tables; then
 	ip6tables -P INPUT   ACCEPT 2> /dev/null
 	ip6tables -P OUTPUT  ACCEPT 2> /dev/null
 	ip6tables -P FORWARD ACCEPT 2> /dev/null
     fi
 
+__EOF__
+    fi
+
+    cat >> $RESTOREBASE << __EOF__
     run_user_exit clear
 
     set_state "Cleared"
diff --git a/Shorewall/prog.footer b/Shorewall/prog.footer
index 433cd6415..818ba4cb5 100644
--- a/Shorewall/prog.footer
+++ b/Shorewall/prog.footer
@@ -69,6 +69,12 @@ case "$COMMAND" in
 	status=$?
 	echo "done."
 	;;
+    reload)
+	echo "Reloading Shorewall...."
+	define_firewall
+	status=$?
+	echo "done."
+	;;
     clear)
 	echo "Clearing Shorewall...."
 	clear_firewall