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

Process params file before shorewall.conf

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@482 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-03-06 23:21:25 +00:00
parent aa616f20d6
commit 09fc5e317a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/firewall
View File

@ -4306,6 +4306,14 @@ do_initialize() {
trap "rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9 trap "rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9
if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/params ]; then
params=$SHOREWALL_DIR/params
else
params=/etc/shorewall/params
fi
[ -f $params ] && echo "Processing $params..." && . $params
if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/shorewall.conf ]; then if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/shorewall.conf ]; then
config=$SHOREWALL_DIR/shorewall.conf config=$SHOREWALL_DIR/shorewall.conf
else else
@ -4313,6 +4321,7 @@ do_initialize() {
fi fi
if [ -f $config ]; then if [ -f $config ]; then
echo "Processing $config..."
. $config . $config
else else
echo "$config does not exist!" >&2 echo "$config does not exist!" >&2
@ -4419,8 +4428,6 @@ do_initialize() {
CLEAR_TC= CLEAR_TC=
fi fi
run_user_exit params
# #
# Strip the files that we use often # Strip the files that we use often
# #

2
Shorewall/rules
View File

@ -97,6 +97,8 @@
# 2. In DNAT rules, only IP addresses are # 2. In DNAT rules, only IP addresses are
# allowed; no FQDNs or subnet addresses # allowed; no FQDNs or subnet addresses
# are permitted. # are permitted.
# 3. You may not specify both an interface and
# an address.
# #
# The port that the server is listening on may be # The port that the server is listening on may be
# included and separated from the server's IP address by # included and separated from the server's IP address by