From fc1cc9b0eba8ed99ec34612cbe8ae0a8793fbc43 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 30 Jun 2003 14:21:42 +0000
Subject: [PATCH] Fix capability report -- Simon Matter

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@622 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 1 +
 Shorewall/firewall         | 2 +-
 Shorewall/releasenotes.txt | 8 ++++++--
 Shorewall/shorewall.conf   | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 80e3cb7b0..426e2b79c 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -25,3 +25,4 @@ Changes since 1.4.5
 
 10) Added the SHOREWALL_SHELL configuraiton parameter.
 
+11) Fixed capability reporting (thanks to Simon Matter).
diff --git a/Shorewall/firewall b/Shorewall/firewall
index 5a2e5bae1..eee775d09 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -3364,7 +3364,7 @@ report_capability() # $1 = Capability Name, $2 Capability Setting (if any)
 {
     local setting=
 
-    [ $1 = "Yes" ] && { setting="Available"; shift; } || setting="Not available"
+    [ x$1 = "xYes" ] && { setting="Available"; shift; } || setting="Not available"
 
     echo "  " $@: $setting
 }
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 9703d7d8d..8e6a889bd 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -13,7 +13,11 @@ Problems Corrected:
  
    Example:
 
-   ACCEPT  fw   net:206.124.146.0/24   tcp   pop3
+   ACCEPT  fw  net:206.124.146.0/24   tcp   pop3
+
+3) A problem introduced in Snapshot 20030629 has been corrected whereby
+   the output of the capabilities report was corrupted in the case
+   where the capability was not available.
 
 New Features:
 
@@ -86,4 +90,4 @@ New Features:
 
 7) The shell used to interpret the firewall script
    (/usr/share/shorewall/firewall) may now be specified using the
-   SHOREWALL_SHELL parameter in shorewall.conf.
\ No newline at end of file
+   SHOREWALL_SHELL parameter in shorewall.conf.
diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf
index 45d7964c7..6aa0a2f8e 100755
--- a/Shorewall/shorewall.conf
+++ b/Shorewall/shorewall.conf
@@ -417,7 +417,7 @@ MUTEX_TIMEOUT=60
 #
 # NEWNOTSYN
 #
-# If this variable is set to "No" or "no", then When a TCP packet that does
+# If this variable is set to "No" or "no", then when a TCP packet that does
 # not have the SYN flag set and the ACK and RST flags clear then unless the
 # packet is part of an established connection, it will be dropped by the
 # firewall