extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 07:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize the 'Ordinary Users' error messages.

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/lib.cli-std
View File

@ -46,9 +46,10 @@ get_config() {
fi
fi
if [ "$(id -u)" -eq 0 ]; then
if [ "$(id -u)" -eq 0 ]; then
config=$(find_file $g_program.conf)
else
[ -n "$g_shorewalldir" ] || fatal_error "Ordinary users may not $COMMAND the $CONFDIR/$g_program configuration"
config="$g_shorewalldir/$g_program.conf"
fi
@ -381,7 +382,7 @@ compiler() {
if [ $(id -u) -ne 0 ]; 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
#
@ -413,7 +414,7 @@ compiler() {
shift
shorewallrc=${g_basedir}/shorewallrc
if [ -n "$g_export" ]; then
shorewallrc1=$(find_file shorewallrc)
[ -f "$shorewallrc1" ] || fatal_error "Compiling for export requires a shorewallrc file"