sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-28 18:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate that all commands exist and can execute

Browse Source 
We will output a message indicating what can be done if this occurs
This commit is contained in:
Phil Whineray 2015-10-23 13:53:03 +01:00
parent 768ccdf4c6
commit d63e61c3c3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/firehol.in
View File

@ -925,6 +925,21 @@ require_cmd() {
eval val=\$\{${var}\}
if [ "${val}" ]
then
local cmd=$(echo $val | cut -f1 -d' ')
if [ ! -x "$cmd" ]
then
echo >&2
if [ $block -eq 0 ]
then
echo >&2 "WARNING: optional command does not exist or is not executable ($cmd)"
echo >&2 "please add or correct $var in firehol-defaults.conf"
val=""
else
echo >&2 "ERROR: required command does not exist or is not executable ($cmd)"
echo >&2 "please add or correct $var in firehol-defaults.conf"
exit 1
fi
fi
return 0
elif [ $block -eq 0 ]
then
@ -991,7 +1006,7 @@ do
if [ "$set_in_defaults" ]
then
:
elif [ "@AUTOCONF_RUN@" = "Y" -a ! -z "$autoconf" -a -x "$autoconf" ]
elif [ "@AUTOCONF_RUN@" = "Y" -a ! -z "$autoconf" ]
then
eval $cmd_var=\"$autoconf\"
else