Signed-off-by: Matt Darfeuille <matd...@gmail.com>
---
Shorewall/lib.cli-std | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 1da224ffb..9896e18d4 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1617,23 +1617,15 @@ remote_commands() # $* = original arguments less the
command.
g_export=Yes
- if [ -f $g_shorewalldir/${PRODUCT}.conf ]; then
- if [ -f $g_shorewalldir/params ]; then
- . $g_shorewalldir/params
- fi
-
- ensure_config_path
+ ensure_config_path
- get_config No
+ get_config Yes
- g_haveconfig=Yes
+ g_haveconfig=Yes
- if [ -z "$system" ]; then
- system=$FIREWALL
- [ -n "$system" ] || fatal_error "No system name given and the
FIREWALL option is not set"
- fi
- else
- fatal_error "$g_shorewalldir/$PRODUCT.conf does not exist"
+ if [ -z "$system" ]; then
+ system=$FIREWALL
+ [ -n "$system" ] || fatal_error "No system name given and the FIREWALL
option is not set"
fi
if [ -z "$getcaps" ]; then
--
2.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
