From ebe5f00aabac2bb643fd01d36321ca3af106f6b7 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 10 Sep 2006 21:19:05 +0000
Subject: [PATCH] Retain TC_ENABLED value

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4564 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler   | 6 +++---
 Shorewall/lib.config | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index 437964eda..5ab975709 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -921,7 +921,7 @@ setup_tc1() {
     if [ -n "$TC_SCRIPT" ]; then
         save_progress_message "Setting up Traffic Control..."
 	append_file $TC_SCRIPT
-    elif [ -n "$TC_ENABLED" ]; then
+    elif [ "$TC_ENABLED" = Internal ]; then
 	strip_file_and_lib_load tcdevices tc
 	strip_file_and_lib_load tcclasses tc && setup_traffic_shaping
     fi
@@ -1014,7 +1014,7 @@ __EOF__
     if [ -n "$TC_SCRIPT" ]; then
 	save_progress_message "Refreshing Traffic Shaping"
 	run_user_exit $TC_SCRIPT
-    elif [ -n "$TC_ENABLED" ]; then
+    elif [ "$TC_ENABLED" = Internal ]; then
 	[ -n "$LIB_tc_LOADED" ] && setup_traffic_shaping
     fi
 }
@@ -5278,7 +5278,7 @@ __EOF__
 # Shorewall auxiliary configuration file created by Shorewall version $VERSION - $(date)
 #
 __EOF__
-	    for option in VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE; do
+	    for option in VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE TC_ENABLED; do
 		conditionally_add_option $option
 	    done
 	    exec 3>&-	    
diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index f83fca983..223d48c00 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1969,12 +1969,12 @@ do_initialize() {
    if [ -n "$TC_ENABLED" ] ; then
 	case "$TC_ENABLED" in
 	    [Yy][Ee][Ss])
-		TC_ENABLED=
+		TC_ENABLED=Yes
 		TC_SCRIPT=$(find_file tcstart)
 		[ -f $TC_SCRIPT ] || fatal_error "Unable to find tcstart file"
 		;;
 	    [Ii][Nn][Tt][Ee][Rr][Nn][Aa][Ll])
-		TC_ENABLED=Yes
+	        TC_ENABLED=Internal
 		;;
 	    [Nn][Oo])
 		TC_ENABLED=