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

Don't modify CONFDIR and SHAREDIR in the shell code

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-04-02 12:39:49 -07:00
parent 348c99c7d0
commit fb428bf564
9 changed files with 44 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Shorewall-core/lib.base
View File

@ -39,10 +39,10 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sharedir="$SHAREDIR"/$g_program
g_sbindir="$SBINDIR"
g_vardir="$VARDIR"
g_confdir="$CONFDIR"
g_confdir="$CONFDIR"/$g_program
g_readrc=1
fi
@ -50,39 +50,27 @@ g_basedir=${SHAREDIR}/shorewall
case $g_program in
shorewall)
SHAREDIR=${SHAREDIR}/shorewall
CONFDIR=${CONFDIR}/shorewall
g_product="Shorewall"
g_family=4
g_tool=
g_basedir=${SHAREDIR}/shorewall
g_lite=
;;
shorewall6)
SHAREDIR=${SHAREDIR}/shorewall6
CONFDIR=${CONFDIR}/shorewall6
g_product="Shorewall6"
g_family=6
g_tool=
g_basedir=${SHAREDIR}/shorewall
g_lite=
;;
shorewall-lite)
SHAREDIR=${SHAREDIR}/shorewall-lite
CONFDIR=${CONFDIR}/shorewall-lite
g_product="Shorewall Lite"
g_family=4
g_tool=iptables
g_basedir=${SHAREDIR}/shorewall-lite
g_lite=Yes
;;
shorewall6-lite)
SHAREDIR=${SHAREDIR}/shorewall6-lite
CONFDIR=${CONFDIR}/shorewall6-lite
g_product="Shorewall6 Lite"
g_family=6
g_tool=ip6tables
g_basedir=${SHAREDIR}/shorewall6-lite
g_lite=Yes
;;
esac
@ -204,7 +192,7 @@ mutex_off()
rm -f ${LOCKFILE:=${VARDIR}/lock}
}
[ -z "$LEFTSHIFT" ] && . ${g_sharedir}/shorewall/lib.common
[ -z "$LEFTSHIFT" ] && . ${g_basedir}/lib.common
#
# Validate an IP address
@ -362,7 +350,7 @@ ip_vlsm() {
#
ensure_config_path() {
local F
F=${SHAREDIR}/configpath
F=${g_sharedir}/configpath
if [ -z "$CONFIG_PATH" ]; then
[ -f $F ] || { echo " ERROR: $F does not exist"; exit 2; }
. $F

26
Shorewall-core/lib.cli
View File

@ -31,13 +31,13 @@ if [ -z "$g_readrc" ]; then
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"
g_confdir="$CONFDIR"/$g_program
g_sharedir="$SHAREDIR"/$g_program
g_readrc=1
fi
. ${g_sharedir}/shorewall/lib.base
. ${SHAREDIR}/shorewall/lib.base
#
@ -559,11 +559,11 @@ version_command() {
[ $# -gt 0 ] && usage 1
if [ -n "$all" ]; then
echo "shorewall-core: $(cat $g_sharedir/shorewall/coreversion)"
echo "shorewall-core: $(cat $g_sharedir/coreversion)"
for product in shorewall shorewall6 shorewall-lite shorewall6-lite shorewall-init; do
if [ -f $g_sharedir/$product/version ]; then
echo "$product: $(cat $g_sharedir/$product/version)"
if [ -f $g_sharedir/version ]; then
echo "$product: $(cat $g_sharedir/version)"
fi
done
else
@ -853,7 +853,7 @@ show_command() {
show_routing
;;
config)
. ${SHAREDIR}/configpath
. ${g_sharedir}/configpath
if [ -n "$g_filemode" ]; then
echo "CONFIG_PATH=$CONFIG_PATH"
echo "VARDIR=$VARDIR"
@ -925,10 +925,10 @@ show_command() {
echo "forwardUPnP # Allow traffic that upnpd has redirected from"
echo "rejNotSyn # Silently Reject Non-syn TCP packets"
if [ -f ${CONFDIR}/actions ]; then
cat ${SHAREDIR}/actions.std ${CONFDIR}/actions | grep -Ev '^\#|^$'
if [ -f ${g_confdir}/actions ]; then
cat ${g_sharedir}/actions.std ${g_confdir}/actions | grep -Ev '^\#|^$'
else
grep -Ev '^\#|^$' ${SHAREDIR}/actions.std
grep -Ev '^\#|^$' ${g_sharedir}/actions.std
fi
return
@ -2981,7 +2981,7 @@ shorewall_cli() {
VERBOSE=
VERBOSITY=
[ -n "$g_lite" ] || . ${g_sharedir}/shorewall/lib.cli-std
[ -n "$g_lite" ] || . ${g_basedir}/lib.cli-std
finished=0
@ -3086,7 +3086,7 @@ shorewall_cli() {
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
MUTEX_TIMEOUT=
[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir
[ -f ${g_confdir}/vardir ] && . ${g_confdir}/vardir
[ -n "${VARDIR:=/var/lib/$g_program}" ]
@ -3096,7 +3096,7 @@ shorewall_cli() {
g_firewall=${VARDIR}/firewall
version_file=$SHAREDIR/version
version_file=${g_sharedir}/version
if [ -f $version_file ]; then
SHOREWALL_VERSION=$(cat $version_file)
else

2
Shorewall-core/lib.common
View File

@ -676,7 +676,7 @@ find_file()
fi
done
echo ${CONFDIR}/$1
echo ${g_confdir}/$1
;;
esac
}

3
Shorewall-lite/shorewall-lite
View File

@ -33,8 +33,9 @@ g_program=shorewall-lite
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sharedir="$SHAREDIR"/shoerwall-lite
g_sbindir="$SBINDIR"
g_confdir="$CONFDIR"/shorewall-lite
g_readrc=1
. $g_sharedir/shorewall/lib.cli

36
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -168,61 +168,53 @@ sub generate_script_2() {
emit( 'g_family=4' );
if ( $export ) {
emit ( qq(SHAREDIR=$shorewallrc{SHAREDIR}/shorewall-lite),
qq(CONFDIR=$shorewallrc{CONFDIR}/shorewall-lite),
qq(VARDIR=$shorewallrc{VARDIR}/shorewall-lite),
emit ( qq(g_confdir=$shorewallrc{CONFDIR}/shorewall-lite),
'g_product="Shorewall Lite"',
'g_program=shorewall-lite',
'g_basedir=/usr/share/shorewall-lite',
qq(CONFIG_PATH="$shorewallrc{CONFDIR}/shorewall-lite:$shorewallrc{SHAREDIR}/shorewall-lite") ,
);
} else {
emit ( qq(SHAREDIR=$shorewallrc{SHAREDIR}/shorewall),
qq(CONFDIR=$shorewallrc{CONFDIR}/shorewall),
qq(VARDIR=$shorewallrc{VARDIR}/shorewall),
emit ( qq(g_confdir=$shorewallrc{CONFDIR}/shorewall),
'g_product=Shorewall',
'g_program=shorewall',
'g_basedir=/usr/share/shorewall',
qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
);
}
} else {
emit( 'g_family=6' );
if ( $export ) {
emit ( qq(SHAREDIR=$shorewallrc{SHAREDIR}/shorewall6-lite),
qq(CONFDIR=$shorewallrc{CONFDIR}/shorewall6-lite),
qq(VARDIR=$shorewallrc{VARDIR}/shorewall6-lite),
emit ( qq(g_confdir=$shorewallrc{CONFDIR}/shorewall6-lite),
'g_product="Shorewall6 Lite"',
'g_program=shorewall6-lite',
'g_basedir=/usr/share/shorewall6',
qq(CONFIG_PATH="$shorewallrc{CONFDIR}/shorewall6-lite:$shorewallrc{SHAREDIR}/shorewall6-lite") ,
);
} else {
emit ( qq(SHAREDIR=$shorewallrc{SHAREDIR}/shorewall6),
qq(CONFDIR=$shorewallrc{CONFDIR}/shorewall6),
qq(VARDIR=$shorewallrc{VARDIR}/shorewall6}),
emit ( qq(g_confdir=$shorewallrc{CONFDIR}/shorewall6),
'g_product=Shorewall6',
'g_program=shorewall6',
'g_basedir=/usr/share/shorewall'
'g_basedir=/usr/share/shorewall',
qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
);
}
}
emit( '[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir' );
emit( '[ -f ${g_confdir}/vardir ] && . ${g_confdir}/vardir' );
if ( $family == F_IPV4 ) {
if ( $export ) {
emit ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' ,
'[ -n "${VARDIR:=/var/lib/shorewall-lite}" ]' );
emit ( '[ -n "${VARDIR:=' . $shorewallrc{VARDIR} . '/shorewall-lite}" ]' );
} else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
'[ -n "${VARDIR:=/var/lib/shorewall}" ]' );
emit ( '[ -n "${VARDIR:=' . $shorewallrc{VARDIR} . '/shorewall}" ]' );
}
} else {
if ( $export ) {
emit ( 'CONFIG_PATH="/etc/shorewall6-lite:/usr/share/shorewall6-lite"' ,
'[ -n "${VARDIR:=/var/lib/shorewall6-lite}" ]' );
emit ( '[ -n "${VARDIR:=' . $shorewallrc{VARDIR} . '/shorewall6-lite}" ]' );
} else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
'[ -n "${VARDIR:=/var/lib/shorewall6}" ]' );
emit ( '[ -n "${VARDIR:=' . $shorewallrc{VARDIR} . '/shorewall6}" ]' );
}
}

8
Shorewall/lib.cli-std
View File

@ -31,7 +31,6 @@
#
get_config() {
local prog
local confdir
ensure_config_path
@ -49,10 +48,7 @@ get_config() {
if [ -f $config ]; then
if [ -r $config ]; then
confdir=${CONFDIR}
CONFDIR=${g_confdir}
. $config
CONFDIR=${confdir}
else
echo "Cannot read $config! (Hint: Are you root?)" >&2
exit 1
@ -382,7 +378,7 @@ compiler() {
#
# Get the config from $g_shorewalldir
#
[ -n "$g_shorewalldir" -a "$g_shorewalldir" != /etc/$g_program ] && get_config
[ -n "$g_shorewalldir" -a "$g_shorewalldir" != ${g_confdir} ] && get_config
case $COMMAND in
*start|try|refresh)
@ -407,7 +403,7 @@ compiler() {
shorewallrc=$(find_file shorewallrc)
[ -f "$shorewallrc" ] || fatal_error "Compiling for export requires a shorewallrc file"
else
shorewallrc="${g_sharedir}/shorewall/shorewallrc"
shorewallrc="${g_basedir}/shorewallrc"
fi
options="--verbose=$VERBOSITY --family=$g_family --config_path=$CONFIG_PATH --shorewallrc=${shorewallrc}"

6
Shorewall/shorewall
View File

@ -33,12 +33,12 @@ g_program=shorewall
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sharedir="$SHAREDIR"/shorewall
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"
g_confdir="$CONFDIR"/shorewall
g_readrc=1
. $g_sharedir/shorewall/lib.cli
. $g_sharedir/lib.cli
shorewall_cli $@

4
Shorewall6-lite/shorewall6-lite
View File

@ -33,10 +33,10 @@ g_program=shorewall6-lite
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sharedir="$SHAREDIR"/shorewall6-lite
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"
g_confdir="$CONFDIR"/shorewall6-lite
g_readrc=1
. $g_sharedir/shorewall/lib.cli

6
Shorewall6/shorewall6
View File

@ -33,12 +33,12 @@ g_program=shorewall6
. /usr/share/shorewall/shorewallrc
g_libexec="$LIBEXECDIR"
g_sharedir="$SHAREDIR"
g_sharedir="$SHAREDIR"/shorewall6
g_sbindir="$SBINDIR"
g_perllib="$PERLLIBDIR"
g_confdir="$CONFDIR"
g_confdir="$CONFDIR"/shorewall6
g_readrc=1
. $g_sharedir/shorewall/lib.cli
. $g_sharedir/lib.cli
shorewall_cli $@