From c88fbbe24a79281bc7c2c47ece6c0806fe10fe1a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 10 Apr 2005 23:08:21 +0000
Subject: [PATCH] Improve error message

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

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index afc25574f..3b999b15a 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -4,6 +4,8 @@ Changes in 2.2.4
 
 2) Add 'started' hook.
 
+3) Make an error message more self-explanatory
+
 Changes in 2.2.3
 
 1) Added the 'continue' extension script.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index ad790da42..e764d1499 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5001,7 +5001,7 @@ rules_chain() # $1 = source zone, $2 = destination zone
 
     [ -n "$chain" ] && { echo $chain; return; }
 
-    fatal_error "No appropriate chain for zone $1 to zone $2"
+    fatal_error "No policy defined for zone $1 to zone $2"
 }
 
 #
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 05f7fe5e3..218c64171 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -3,7 +3,13 @@ Shorewall 2.2.4
 -----------------------------------------------------------------------
 Problems corrected in version 2.2.4
 
-None.
+1) The error message:
+
+       Error: No appropriate chain for zone <z1> to zone <z2>
+
+   has been changed to one that is more self-explanatory:
+
+       Error: No policy defined for zone <z1> to zone <z2> 
 
 -----------------------------------------------------------------------
 New Features in version 2.2.4