From cecb8a1950ca68c273d5da430c361f95226ccd73 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 6 Feb 2017 10:52:31 -0800
Subject: [PATCH] Deprecate the Drop and Reject actions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Actions/{action.Drop => action.Drop.deprecated}     | 3 ++-
 Shorewall/Actions/{action.Reject => action.Reject.deprecated} | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename Shorewall/Actions/{action.Drop => action.Drop.deprecated} (91%)
 rename Shorewall/Actions/{action.Reject => action.Reject.deprecated} (91%)

diff --git a/Shorewall/Actions/action.Drop b/Shorewall/Actions/action.Drop.deprecated
similarity index 91%
rename from Shorewall/Actions/action.Drop
rename to Shorewall/Actions/action.Drop.deprecated
index ef5610608..c328c929c 100644
--- a/Shorewall/Actions/action.Drop
+++ b/Shorewall/Actions/action.Drop.deprecated
@@ -1,7 +1,7 @@
 #
 # Shorewall -- /usr/share/shorewall/action.Drop
 #
-# The default DROP common rules
+# The former default DROP common rules. Use of this action is now deprecated
 #
 # This action is invoked before a DROP policy is enforced. The purpose
 # of the action is:
@@ -28,6 +28,7 @@
 # IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!!
 #
 ###############################################################################
+?warning "You are using the deprecated Drop default action. Please see http://www.shorewall.net/Actions.html#Default"
 
 ?if passed(@1)
     ?if @1 eq 'audit'
diff --git a/Shorewall/Actions/action.Reject b/Shorewall/Actions/action.Reject.deprecated
similarity index 91%
rename from Shorewall/Actions/action.Reject
rename to Shorewall/Actions/action.Reject.deprecated
index b9fdd9caf..4df6aa4ca 100644
--- a/Shorewall/Actions/action.Reject
+++ b/Shorewall/Actions/action.Reject.deprecated
@@ -1,7 +1,7 @@
 #
 # Shorewall -- /usr/share/shorewall/action.Reject
 #
-# The default REJECT action common rules
+# The former default REJECT action common rules. Use of this action is deprecated.
 #
 # This action is invoked before a REJECT policy is enforced. The purpose
 # of the action is:
@@ -27,6 +27,7 @@
 #
 # IF YOU ARE HAVING CONNECTION PROBLEMS, CHANGING THIS FILE WON'T HELP!!!!!!!!!
 ###############################################################################
+?warning "You are using the deprecated Reject default action. Please see http://www.shorewall.net/Actions.html#Default"
 
 ?if passed(@1)
     ?if @1 eq 'audit'