Standardize the 'Ordinary Users' error messages.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-13 12:45:28 -08:00
parent f8e5950fe5
commit 0461e5de20

View File

@ -49,6 +49,7 @@ get_config() {
if [ "$(id -u)" -eq 0 ]; then if [ "$(id -u)" -eq 0 ]; then
config=$(find_file $g_program.conf) config=$(find_file $g_program.conf)
else else
[ -n "$g_shorewalldir" ] || fatal_error "Ordinary users may not $COMMAND the $CONFDIR/$g_program configuration"
config="$g_shorewalldir/$g_program.conf" config="$g_shorewalldir/$g_program.conf"
fi fi
@ -381,7 +382,7 @@ compiler() {
if [ $(id -u) -ne 0 ]; then if [ $(id -u) -ne 0 ]; then
if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = /etc/$g_program ]; then if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = /etc/$g_program ]; then
startup_error "Ordinary users may not compile the /etc/$g_program configuration" startup_error "Ordinary users may not $COMMAND the $CONFDIR/$g_program configuration"
fi fi
fi fi
# #