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

Clean up setting of directory variables

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4065 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-11 15:07:34 +00:00
parent f127babe5d
commit 81dac144e3
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall-lite/shorewall
View File

@ -88,10 +88,6 @@
# #
# Fatal Error # Fatal Error
# #
SHAREDIR=/usr/share/shorewall-lite
VARDIR=/var/lib/shorewall-lite
CONFDIR=/etc/shorewall-lite
fatal_error() # $@ = Message fatal_error() # $@ = Message
{ {
echo " $@" >&2 echo " $@" >&2
@ -1174,11 +1170,14 @@ fi
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
MUTEX_TIMEOUT= MUTEX_TIMEOUT=
SHARED_DIR=${SHAREDIR} SHAREDIR=/usr/share/shorewall-lite
FIREWALL=$SHARED_DIR/firewall VARDIR=/var/lib/shorewall-lite
FUNCTIONS=$SHARED_DIR/functions CONFDIR=/etc/shorewall-lite
VERSION_FILE=$SHARED_DIR/version
HELP=$SHARED_DIR/help FIREWALL=$SHAREDIR/firewall
FUNCTIONS=$SHAREDIR/functions
VERSION_FILE=$SHAREDIR/version
HELP=$SHAREDIR/help
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
. $FUNCTIONS . $FUNCTIONS

12
Shorewall/compiler
View File

@ -40,10 +40,6 @@
# SHOREWALL_DIR A directory name was passed to /sbin/shorewall # SHOREWALL_DIR A directory name was passed to /sbin/shorewall
# VERBOSE Standard Shorewall verbosity control. # VERBOSE Standard Shorewall verbosity control.
SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
# Fatal error -- stops the compiler after issuing the error message # Fatal error -- stops the compiler after issuing the error message
# #
fatal_error() # $* = Error Message fatal_error() # $* = Error Message
@ -8598,7 +8594,6 @@ do_initialize() {
TCP_FLAGS_LOG_LEVEL= TCP_FLAGS_LOG_LEVEL=
RFC1918_LOG_LEVEL= RFC1918_LOG_LEVEL=
MARK_IN_FORWARD_CHAIN= MARK_IN_FORWARD_CHAIN=
SHARED_DIR=${SHAREDIR}
FUNCTIONS= FUNCTIONS=
VERSION_FILE= VERSION_FILE=
LOGFORMAT= LOGFORMAT=
@ -8641,7 +8636,12 @@ do_initialize() {
SECTION=ESTABLISHED SECTION=ESTABLISHED
SECTIONS= SECTIONS=
ALL_PORTS= ALL_PORTS=
FUNCTIONS=$SHARED_DIR/functions
SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
FUNCTIONS=${SHAREDIR}/functions
[ -n "${VERBOSE:=2}" ] [ -n "${VERBOSE:=2}" ]

10
Shorewall/firewall
View File

@ -40,9 +40,6 @@
# and rules/policies. # and rules/policies.
# shorewall refresh . Rebuild the common chain # shorewall refresh . Rebuild the common chain
# #
SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
# Mutual exclusion -- These functions are jackets for the mutual exclusion # Mutual exclusion -- These functions are jackets for the mutual exclusion
# routines in $FUNCTIONS. They invoke # routines in $FUNCTIONS. They invoke
# the corresponding function in that file if the user did # the corresponding function in that file if the user did
@ -2298,7 +2295,6 @@ do_initialize() {
TCP_FLAGS_LOG_LEVEL= TCP_FLAGS_LOG_LEVEL=
RFC1918_LOG_LEVEL= RFC1918_LOG_LEVEL=
MARK_IN_FORWARD_CHAIN= MARK_IN_FORWARD_CHAIN=
SHARED_DIR=${SHAREDIR}
FUNCTIONS= FUNCTIONS=
VERSION_FILE= VERSION_FILE=
LOGFORMAT= LOGFORMAT=
@ -2341,7 +2337,11 @@ do_initialize() {
SECTIONS= SECTIONS=
ALL_PORTS= ALL_PORTS=
FUNCTIONS=$SHARED_DIR/functions SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
FUNCTIONS=${SHAREDIR}/functions
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
[ $VERBOSE -gt 1 ] && echo "Loading $FUNCTIONS..." [ $VERBOSE -gt 1 ] && echo "Loading $FUNCTIONS..."

17
Shorewall/shorewall
View File

@ -113,10 +113,6 @@
# shorewall compile [ <directory> ] ]<filename> # shorewall compile [ <directory> ] ]<filename>
# Compile a firewall program file. # Compile a firewall program file.
# #
SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
# Fatal Error # Fatal Error
# #
fatal_error() # $@ = Message fatal_error() # $@ = Message
@ -1516,11 +1512,14 @@ fi
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
MUTEX_TIMEOUT= MUTEX_TIMEOUT=
SHARED_DIR=${SHAREDIR} SHAREDIR=/usr/share/shorewall
FIREWALL=$SHARED_DIR/firewall VARDIR=/var/lib/shorewall
FUNCTIONS=$SHARED_DIR/functions CONFDIR=/etc/shorewall
VERSION_FILE=$SHARED_DIR/version
HELP=$SHARED_DIR/help FIREWALL=$SHAREDIR/firewall
FUNCTIONS=$SHAREDIR/functions
VERSION_FILE=$SHAREDIR/version
HELP=$SHAREDIR/help
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
. $FUNCTIONS . $FUNCTIONS