From d5f3b31032014803ece6acdb642e4f111626a3e7 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 18 Jan 2011 14:58:56 -0800
Subject: [PATCH] Handle lines containing only 'INCLUDE'

---
 Shorewall/Perl/Shorewall/Config.pm | 2 +-
 Shorewall/changelog.txt            | 4 ++++
 Shorewall/releasenotes.txt         | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 4eaa75151..81094016f 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -1424,7 +1424,7 @@ sub copy1( $ ) {
 		}
 
 		if ( $do_indent ) {
-		    if ( /^\s*INCLUDE\s/ ) {
+		    if ( /^\s*INCLUDE\b/ ) {
 			my @line = split / /;
 
 			fatal_error "Invalid INCLUDE command"    if @line != 2;
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index aa9c73856..ebbea8bd3 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,5 +1,9 @@
 Changes in Shorewall 4.4.17 Beta 1
 
+1)  Handle line containing only INCLUDE.
+
+Changes in Shorewall 4.4.17 Beta 1
+
 1)  Improve readability of logging logic in expand_rule().
 
 2)  Improve efficency of oddball targets in process_rule1().
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index b0b837c88..cd93190c2 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -14,6 +14,14 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+Beta 2
+
+1)  A line containing only 'INCLUDE' appearing in an extension script
+    now generates a compile-time diagnostic rather than a run-time
+    diagnostic.
+
+Beta 1
+
 1)  Previously, a 'done.' message could be printed at the end of
     command processing even when the command had failed. Now, such a
     message only appears if the command completed successfully.