From f73bad440d9556f3867e90cef2b3b59666b60638 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 14 Nov 2017 10:02:15 -0800 Subject: [PATCH] Don't verify IP and SHOREWALL_SHELL when compiling/checking for test Signed-off-by: Tom Eastep --- Shorewall/lib.cli-std | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index f7885346e..82e0f00f7 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -211,7 +211,7 @@ get_config() { LOG_VERBOSITY=-1 fi - if [ -z "$g_export" -a "$(id -u)" = 0 ]; then + if [ -z "${g_export}${g_test}" ]; then if [ -n "$SHOREWALL_SHELL" -a -z "$g_export" ]; then if [ ! -x "$SHOREWALL_SHELL" ]; then echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2 @@ -775,6 +775,10 @@ check_command() { g_profile=Yes option=${option#p} ;; + t*) + g_test=Yes + option=${option#t} + ;; d*) g_debug=Yes; option=${option#d} @@ -859,6 +863,10 @@ update_command() { g_profile=Yes option=${option#p} ;; + t*) + g_test=Yes + option=${option#t} + ;; d*) g_debug=Yes; option=${option#d}