From c31cb73f8cda236aa6221e2e050dd44e4b14d9e9 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 21 Feb 2004 20:32:32 +0000 Subject: [PATCH] Remove one-subnet restriction on 'detect' in the interfaces file git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1171 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/firewall | 7 +------ Shorewall2/interfaces | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 0e547aa94..810a8868a 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -779,12 +779,7 @@ find_broadcasts() { for interface in $all_interfaces; do eval bcast=\$$(chain_base $interface)_broadcast if [ "x$bcast" = "xdetect" ]; then - addr="$(ip -f inet addr show $interface 2> /dev/null)" - if [ -n "$(echo "$addr" | grep 'inet.*brd ')" ]; then - addr="$(echo "$addr" | \ - grep "inet " | sed 's/^.* inet.*brd //;s/scope.*//')" - echo $addr | cut -d' ' -f 1 - fi + ip -f inet addr show $interface 2> /dev/null | grep 'inet.*brd' | sed 's/inet.*brd //; s/scope.*//;' | sort -u elif [ "x${bcast}" != "x-" ]; then echo $(separate_list $bcast) fi diff --git a/Shorewall2/interfaces b/Shorewall2/interfaces index 73d04fb1b..9d25a0f1f 100644 --- a/Shorewall2/interfaces +++ b/Shorewall2/interfaces @@ -37,8 +37,7 @@ # will detect the broadcast address for you. If you # select this option, the interface must be up before # the firewall is started, you must have iproute -# installed and the interface must only be associated -# with a single subnet. +# installed. # # If you don't want to give a value for this column but # you want to enter a value in the OPTIONS column, enter