From e023c8b712aa0baf81c14cbde540e6a98021c3e0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 7 May 2004 19:57:33 +0000
Subject: [PATCH] Fix rules file; add 'initialized' script

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

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 65d009fc3..6da749030 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -49,3 +49,5 @@ Changes since 2.0.1
 23) Apply Alex Wilms's patch for install.sh
 
 24) Add ACCEPT+ and NONAT targets.
+
+25) Added 'initialized' extension script.
\ No newline at end of file
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index fa225f567..1fadc5122 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -4816,6 +4816,8 @@ add_common_rules() {
 	run_iptables -A reject -j REJECT
     fi
 
+    run_user_exit initialized
+
     #
     # Process Black List
     #
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index dceba398f..7886fd2c4 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -21,7 +21,8 @@ Problems Corrected since 2.0.1
 
 Problems Corrected since 2.0.2 Beta 2
 
-None.
+1) A missing '#' in the rules file caused errors when processing the
+   file.
 
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1:
@@ -218,5 +219,8 @@ New Features:
     NONAT      -- Exempts matching connections from subsequent DNAT[-]
                   and REDIRECT[-] rules.
 
-
-
+12) A new extension script 'initialized' has been added. This script is invoked
+    at the same point as the 'common' script was previously and is useful for
+    users who mis-used that script under Shorewall 1.x (the script was intended 
+    for adding rules to the 'common' chain but many users treated it as a script
+    for adding rules before Shorewall's).
\ No newline at end of file
diff --git a/Shorewall2/rules b/Shorewall2/rules
index f11a4ff53..4df78481b 100755
--- a/Shorewall2/rules
+++ b/Shorewall2/rules
@@ -30,7 +30,7 @@
 #					    DNAT[-] or REDIRECT[-] rules
 #				NONAT    -- Excludes the connection from any
 #					    subsequent DNAT[-] or REDIRECT[-]
-					    rules but doesn't generate a rule
+#					    rules but doesn't generate a rule
 #					    to accept the traffic.
 #				DROP     -- ignore the request
 #				REJECT   -- disallow the request and return an