From 2bdcada87495665ae35a1da95f45dcbb502a7bad Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 2 Jun 2003 18:08:35 +0000 Subject: [PATCH] Fix routestopped; minor fix in rules processing git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@583 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/firewall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/firewall b/Shorewall/firewall index 51ef237e2..d491cd8e8 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -1000,7 +1000,7 @@ stop_firewall() { while read interface host; do expandv interface host - [ "x$host" = "x-" ] && host=0.0.0.0/0 + [ "x$host" = "x-" -o -z "$host" ] && host=0.0.0.0/0 for h in `separate_list $host`; do hosts="$hosts $interface:$h" done @@ -1795,7 +1795,7 @@ add_nat_rule() { local chain local excludedests= - # Be sure we should and can NAT + # Be sure we can NAT if [ -z "$NAT_ENABLED" ]; then fatal_error "Rule \"$rule\" requires NAT which is disabled" @@ -1821,7 +1821,7 @@ add_nat_rule() { if [ -n "$DETECT_DNAT_IPADDRS" -a "$source" != "$FW" ]; then eval interfaces=\$${source}_interfaces for interface in $interfaces; do - addr="`find_interface_address $interface` $addr" + addr=${addr:+$addr,}`find_interface_address $interface` done fi ;;