extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't verify IP and SHOREWALL_SHELL setting when compiling for export

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-11-14 08:50:05 -08:00
parent 2a9272ccd1
commit 9d299ef866
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Shorewall/lib.cli-std
View File

@ -211,30 +211,35 @@ get_config() {
LOG_VERBOSITY=-1 LOG_VERBOSITY=-1
fi fi
if [ -n "$SHOREWALL_SHELL" -a -z "$g_export" ]; then if [ -z "$g_export" -a "$(id -u)" = 0 ]; then
if [ ! -x "$SHOREWALL_SHELL" ]; then if [ -n "$SHOREWALL_SHELL" -a -z "$g_export" ]; then
echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2 if [ ! -x "$SHOREWALL_SHELL" ]; then
SHOREWALL_SHELL=/bin/sh echo " WARNING: The program specified in SHOREWALL_SHELL does not exist or is not executable; falling back to /bin/sh" >&2
SHOREWALL_SHELL=/bin/sh
fi
fi fi
fi
if [ -n "$IP" ]; then if [ -n "$IP" ]; then
case "$IP" in case "$IP" in
*/*) */*)
if [ ! -x "$IP" ] ; then if [ ! -x "$IP" ] ; then
fatal_error "The program specified in IP ($IP) does not exist or is not executable" fatal_error "The program specified in IP ($IP) does not exist or is not executable"
fi fi
;; ;;
*) *)
prog="$(mywhich $IP 2> /dev/null)" prog="$(mywhich $IP 2> /dev/null)"
if [ -z "$prog" ] ; then if [ -z "$prog" ] ; then
fatal_error "Can't find $IP executable" fatal_error "Can't find $IP executable"
fi fi
IP=$prog IP=$prog
;; ;;
esac esac
else
IP='ip'
fi
else else
IP='ip' [ -n "$SHOREWALL_SHELL" ] || SHOREWALL_SHELL=/bin/sh
[ -n "$IP" ] || IP='ip'
fi fi
case $VERBOSITY in case $VERBOSITY in