Fix 'dump -m'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6360 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-15 19:35:26 +00:00
parent 72785c6d55
commit 0040a99a44
2 changed files with 9 additions and 5 deletions

View File

@ -611,6 +611,10 @@ dump_command() {
IPT_OPTIONS="-xnv" IPT_OPTIONS="-xnv"
option=${option#x} option=${option#x}
;; ;;
m*)
SHOWMACS=Yes
option=${option#m}
;;
*) *)
usage 1 usage 1
;; ;;

View File

@ -401,11 +401,11 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
hosts=${h#*:} hosts=${h#*:}
if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then
if is_ipsec_host $z1 $h; then if is_ipsec_host $z1 $h; then
qt_iptables -D ${z1}_dyn -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain qt_iptables -D ${z1}_dyn -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain
else else
qt_iptables -D $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain qt_iptables -D $(dynamic_fwd $iface) $(match_source_hosts $hosts) -o $interface $(match_dest_hosts $host) $(match_ipsec_out $z2 $delhost) -j $chain
fi fi
fi fi
done done
fi fi