mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-12 08:38:14 +01:00
More whitespace elimination; avoid stale lock file in some error cases
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2702 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
77945848af
commit
504728a079
@ -7615,7 +7615,7 @@ add_common_rules() {
|
|||||||
hosts=$(find_hosts_by_option nosmurfs)
|
hosts=$(find_hosts_by_option nosmurfs)
|
||||||
|
|
||||||
if [ -n "$hosts" ]; then
|
if [ -n "$hosts" ]; then
|
||||||
|
|
||||||
echo "Adding Anti-smurf Rules"
|
echo "Adding Anti-smurf Rules"
|
||||||
|
|
||||||
for host in $hosts; do
|
for host in $hosts; do
|
||||||
@ -7760,7 +7760,7 @@ add_common_rules() {
|
|||||||
log_rule $TCP_FLAGS_LOG_LEVEL logflags $TCP_FLAGS_DISPOSITION
|
log_rule $TCP_FLAGS_LOG_LEVEL logflags $TCP_FLAGS_DISPOSITION
|
||||||
|
|
||||||
LOGPARMS="$savelogparms"
|
LOGPARMS="$savelogparms"
|
||||||
|
|
||||||
case $TCP_FLAGS_DISPOSITION in
|
case $TCP_FLAGS_DISPOSITION in
|
||||||
REJECT)
|
REJECT)
|
||||||
run_iptables -A logflags -j REJECT --reject-with tcp-reset
|
run_iptables -A logflags -j REJECT --reject-with tcp-reset
|
||||||
@ -7950,7 +7950,7 @@ add_common_rules() {
|
|||||||
echo "Setting up UPnP..."
|
echo "Setting up UPnP..."
|
||||||
|
|
||||||
createnatchain UPnP
|
createnatchain UPnP
|
||||||
|
|
||||||
for interface in $interfaces; do
|
for interface in $interfaces; do
|
||||||
run_iptables -t nat -A PREROUTING -i $interface -j UPnP
|
run_iptables -t nat -A PREROUTING -i $interface -j UPnP
|
||||||
done
|
done
|
||||||
@ -8212,7 +8212,7 @@ activate_rules()
|
|||||||
routeback=
|
routeback=
|
||||||
num_ifaces=0
|
num_ifaces=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$complex" ]; then
|
if [ -n "$complex" ]; then
|
||||||
for host1 in $dest_hosts; do
|
for host1 in $dest_hosts; do
|
||||||
interface1=${host1%%:*}
|
interface1=${host1%%:*}
|
||||||
@ -8231,7 +8231,7 @@ activate_rules()
|
|||||||
networks=${host#*:}
|
networks=${host#*:}
|
||||||
|
|
||||||
chain3=$(forward_chain $interface)
|
chain3=$(forward_chain $interface)
|
||||||
|
|
||||||
for host1 in $dest_hosts; do
|
for host1 in $dest_hosts; do
|
||||||
interface1=${host1%%:*}
|
interface1=${host1%%:*}
|
||||||
networks1=${host1#*:}
|
networks1=${host1#*:}
|
||||||
@ -9016,12 +9016,10 @@ do_initialize() {
|
|||||||
[ -n "$QUIET" ] || echo "Processing $config..."
|
[ -n "$QUIET" ] || echo "Processing $config..."
|
||||||
. $config
|
. $config
|
||||||
else
|
else
|
||||||
echo " ERROR: Cannot read $config (Hint: Are you root?)"
|
startup_error "Cannot read $config (Hint: Are you root?)"
|
||||||
exit 2
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "$config does not exist!" >&2
|
startup_error "$config does not exist!"
|
||||||
exit 2
|
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
# Restore CONFIG_PATH if the shorewall.conf file cleared it
|
# Restore CONFIG_PATH if the shorewall.conf file cleared it
|
||||||
|
Loading…
Reference in New Issue
Block a user