mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 01:37:59 +02:00
Make FORWARDPING=Yes verboten under OLD_PING_HANDLING=No; make 'list' a synonym for 'show' in /sbin/shorewall
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@410 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
b35d93acac
commit
a0cb5de22c
@ -4353,7 +4353,7 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
|
|||||||
while read z1 z2 chain; do
|
while read z1 z2 chain; do
|
||||||
if [ "$z1" = "$zone" ]; then
|
if [ "$z1" = "$zone" ]; then
|
||||||
if [ "$z2" = "$FW" ]; then
|
if [ "$z2" = "$FW" ]; then
|
||||||
qt iptables -D `input_chain $interface` -i $interface -s $host -j $chain
|
qt iptables -D `input_chain $interface` -s $host -j $chain
|
||||||
else
|
else
|
||||||
source_chain=`forward_chain $interface`
|
source_chain=`forward_chain $interface`
|
||||||
eval dest_hosts=\"\$${z2}_hosts\"
|
eval dest_hosts=\"\$${z2}_hosts\"
|
||||||
@ -4608,6 +4608,9 @@ do_initialize() {
|
|||||||
fi
|
fi
|
||||||
OLD_PING_HANDLING=`added_param_value_yes OLD_PING_HANDLING $OLD_PING_HANDLING`
|
OLD_PING_HANDLING=`added_param_value_yes OLD_PING_HANDLING $OLD_PING_HANDLING`
|
||||||
|
|
||||||
|
[ -z "$OLD_PING_HANDLING" -a -n "$FORWARDPING" ] && \
|
||||||
|
startup_error "FORWARDPING=Yes is incompatible with OLD_PING_HANDLING=No"
|
||||||
|
|
||||||
run_user_exit params
|
run_user_exit params
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -649,7 +649,7 @@ case "$1" in
|
|||||||
[ $# -ne 3 ] && usage 1
|
[ $# -ne 3 ] && usage 1
|
||||||
exec $FIREWALL $debugging $nolock $1 $2 $3
|
exec $FIREWALL $debugging $nolock $1 $2 $3
|
||||||
;;
|
;;
|
||||||
show)
|
show|list)
|
||||||
[ $# -gt 2 ] && usage 1
|
[ $# -gt 2 ] && usage 1
|
||||||
case "$2" in
|
case "$2" in
|
||||||
connections)
|
connections)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user