extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 14:48:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct startup_error() inadvertent change

Browse Source 
- Switch ensure_root() back to calling startup_error()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-12-30 09:24:21 -08:00
parent 45a164733b
commit 6b5889177b
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.cli
View File

@ -42,7 +42,7 @@ fi
# Issue an error message and die
#
startup_error() {
echo " ERROR: $@" >&21
echo " ERROR: $@" >&2
kill $$
exit 1
}

2
Shorewall/lib.cli-std
View File

@ -368,7 +368,7 @@ get_config() {
ensure_root() {
if [ $(id -u) -ne 0 ]; then
if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = $CONFDIR/$PRODUCT ]; then
fatal_error "Ordinary users may not $COMMAND the default $PRODUCT configuration"
startup_error "Ordinary users may not $COMMAND the default $PRODUCT configuration"
fi
fi
}