From 469c882f1defa9c1b9b7b1633d3acea70da1dd64 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 27 May 2006 03:36:12 +0000
Subject: [PATCH] Make 'trace' also trace the execution of the compiled program

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3940 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/prog.footer        | 5 +++++
 Shorewall/prog.footer.debian | 5 +++++
 Shorewall/prog.footer.redhat | 5 +++++
 Shorewall/prog.footer.suse   | 5 +++++
 Shorewall/releasenotes.txt   | 9 ++++++---
 Shorewall/shorewall          | 4 ++--
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Shorewall/prog.footer b/Shorewall/prog.footer
index cdd1f2867..9232b065d 100644
--- a/Shorewall/prog.footer
+++ b/Shorewall/prog.footer
@@ -10,6 +10,11 @@ usage() {
 ################################################################################
 initialize
 
+#
+# Start trace if first arg is "debug"
+#
+[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
+
 finished=0
 
 while [ $finished -eq 0 -a $# -gt 0 ]; do
diff --git a/Shorewall/prog.footer.debian b/Shorewall/prog.footer.debian
index cdd1f2867..9232b065d 100644
--- a/Shorewall/prog.footer.debian
+++ b/Shorewall/prog.footer.debian
@@ -10,6 +10,11 @@ usage() {
 ################################################################################
 initialize
 
+#
+# Start trace if first arg is "debug"
+#
+[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
+
 finished=0
 
 while [ $finished -eq 0 -a $# -gt 0 ]; do
diff --git a/Shorewall/prog.footer.redhat b/Shorewall/prog.footer.redhat
index c7b5f50db..a79592728 100644
--- a/Shorewall/prog.footer.redhat
+++ b/Shorewall/prog.footer.redhat
@@ -10,6 +10,11 @@ usage() {
 ################################################################################
 initialize
 
+#
+# Start trace if first arg is "debug"
+#
+[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
+
 finished=0
 
 while [ $finished -eq 0 -a $# -gt 0 ]; do
diff --git a/Shorewall/prog.footer.suse b/Shorewall/prog.footer.suse
index 78c8ed49d..32e770fe6 100644
--- a/Shorewall/prog.footer.suse
+++ b/Shorewall/prog.footer.suse
@@ -10,6 +10,11 @@ usage() {
 ################################################################################
 initialize
 
+#
+# Start trace if first arg is "debug"
+#
+[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
+
 finished=0
 
 while [ $finished -eq 0 -a $# -gt 0 ]; do
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 7bd0a989d..cffacc2ed 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -44,6 +44,12 @@ Problems Corrected in 3.2.0 Beta 8
 
     ERROR: BRIDGING=Yes is required for this zone definition: loc br0:eth0
 
+2)  Previously, if LOGFORMAT generated any embedded white-space then a
+    startup error would result.
+
+3)  The 'trace' keyword now causes the execution of the compiled script to
+    be traced when the command is 'start' or 'restart'.
+
 Other changes in 3.2.0 Beta 8
 
 1)  In /etc/shorewall/rules, the values "all-" and "all+-" may now be
@@ -72,9 +78,6 @@ Other changes in 3.2.0 Beta 8
     applies to "shorewall start", "shorewall restart" and "shorewall
     refresh".
 
-4)  Previously, if LOGFORMAT generated any embedded white-space then a
-    startup error would result.
-
 Migration Considerations:
 
 1)  If you are upgrading from Shorewall 2.x, it is essential that you read
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 42c90f6f5..05f7300d0 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -512,7 +512,7 @@ start_command() {
 	progress_message3 "Compiling..."
 
 	if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.start; then
-	    /var/lib/shorewall/.start start
+	    /var/lib/shorewall/.start $debugging start
 	fi
 
 	[ -n "$nolock" ] || mutex_off
@@ -832,7 +832,7 @@ restart_command() {
     progress_message3 "Compiling..."
 
     if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.restart; then
-	$SHOREWALL_SHELL /var/lib/shorewall/.restart restart
+	$SHOREWALL_SHELL /var/lib/shorewall/.restart $debugging restart
     fi
 
     [ -n "$nolock" ] || mutex_off