From 112c4dc38a4822522100265f516d7f81603ada59 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 1 Apr 2020 12:55:14 -0700
Subject: [PATCH] Revert "Temporarily disable fix for exported variables"

This reverts commit 137cc4877964ca15382144f988886e703e432a27.
---
 Shorewall/Perl/Shorewall/Config.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 535e1ca95..a71b6cc5c 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -6012,7 +6012,9 @@ sub export_params() {
 	# Don't export pairs from %ENV
 	#
 	if ( defined $ENV{$param} ) {
-	    next if $value eq $ENV{$param};
+	    unless ( $export || $test ) {
+		next if $value eq $ENV{$param};
+	    }
 	} elsif ( exists $ENV{$param} ) {
 	    next unless supplied $value;
 	}