holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Add a few more comments

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4125 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-16 22:40:36 +00:00
parent 2cee4cb596
commit 2f466f79f1
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall/shorewall
View File

@ -193,7 +193,12 @@ validate_restorefile() # $* = label
get_config() { get_config() {
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
#
# This block is avoided for compile for export and when the user isn't root
#
# We don't export CONFIG_PATH so that CONFIG_PATH will be picked up fresh by the compiler
# from /usr/share/shorewall/configpath.
#
export CONFIG_PATH export CONFIG_PATH
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
@ -227,7 +232,9 @@ get_config() {
else else
realtail="" realtail=""
fi fi
#
# Compile by non-root needs no restore file
#
[ -n "$RESTOREFILE" ] || RESTOREFILE=restore [ -n "$RESTOREFILE" ] || RESTOREFILE=restore
validate_restorefile RESTOREFILE validate_restorefile RESTOREFILE
@ -255,14 +262,14 @@ get_config() {
;; ;;
esac esac
fi
[ -n "LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}" [ -n "LOGFORMAT" ] && LOGFORMAT="${LOGFORMAT%%%*}"
[ -n "$LOGFORMAT" ] || LOGFORMAT="Shorewall:" [ -n "$LOGFORMAT" ] || LOGFORMAT="Shorewall:"
export LOGFORMAT export LOGFORMAT
fi
if [ -n "$SHOREWALL_SHELL" ]; then if [ -n "$SHOREWALL_SHELL" ]; then
if [ ! -e "$SHOREWALL_SHELL" ]; then if [ ! -e "$SHOREWALL_SHELL" ]; then
echo " ERROR: The program specified in SHOREWALL_SHELL does not exist or is not executable" >&2 echo " ERROR: The program specified in SHOREWALL_SHELL does not exist or is not executable" >&2