From 1a95db73e9d99b31f4c1cf09a413eaf8b242dae4 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 20 Dec 2016 08:39:26 -0800
Subject: [PATCH] Revert idiotic change to lib.cli

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/lib.cli  | 2 +-
 Shorewall-core/lib.core | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index f6a95584d..af48f95a7 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -4531,7 +4531,7 @@ shorewall_cli() {
 	usage 1
     fi
 
-    setup_product_environment
+    setup_product_environment 1
 
    [ -n "$g_lite" ] || . ${SHAREDIR}/shorewall/lib.cli-std
 
diff --git a/Shorewall-core/lib.core b/Shorewall-core/lib.core
index 3fe64a5c3..87d0f3169 100644
--- a/Shorewall-core/lib.core
+++ b/Shorewall-core/lib.core
@@ -35,7 +35,7 @@ fatal_error() # $@ = Message
     exit 2
 }
 
-setup_product_environment() {
+setup_product_environment() { # $1 = if non-empty, source shorewallrc again now that we have the correct product
     g_basedir=${SHAREDIR}/shorewall
 
     g_sharedir="$SHAREDIR"/$PRODUCT