From 4db68697b288d06b8cd5953c774659b5fa3ac498 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 28 Nov 2010 07:42:12 -0800
Subject: [PATCH] Fix root cause of macro.JAP failure

---
 Shorewall/Macros/macro.JAP        | 4 ++--
 Shorewall/Perl/Shorewall/Rules.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Macros/macro.JAP b/Shorewall/Macros/macro.JAP
index e71c35e20..7a68ae84d 100644
--- a/Shorewall/Macros/macro.JAP
+++ b/Shorewall/Macros/macro.JAP
@@ -13,5 +13,5 @@
 PARAM	-	-	tcp	8080 # HTTP port
 PARAM	-	-	tcp	6544 # HTTP port
 PARAM	-	-	tcp	6543 # InfoService port
-HTTPS
-SSH
+HTTPS(PARAM)
+SSH(PARAM)
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index d4939495c..8475a5b14 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -1035,7 +1035,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$ ) {
 
 	if ( $param ne '' ) {
 	    push @param_stack, $current_param;
-	    $current_param = $param;
+	    $current_param = $param unless $param eq 'PARAM';
 	}
 
 	my $generated = process_macro( $basictarget,