From 8c87b442428b961a08972707d9ee7971a54ba889 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 14 Sep 2004 15:54:12 +0000 Subject: [PATCH] Improve feature detection logic git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1622 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/firewall | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 628a192a6..8d1ab301d 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -5316,18 +5316,14 @@ determine_capabilities() { qt iptables -A fooX1234 -m physdev --physdev-in eth0 -j ACCEPT && PHYSDEV_MATCH=Yes qt iptables -A fooX1234 -m iprange --src-range 192.168.1.5-192.168.1.124 -j ACCEPT && IPRANGE_MATCH=Yes + + if [ -n "$PKTTYPE" ]; then + qt iptables -A fooX1234 -m pkttype --pkt-type broadcast -j ACCEPT || PKTTYPE= + fi + qt iptables -F fooX1234 qt iptables -X fooX1234 fi - - if [ -n "$PKTTYPE" ]; then - if qt iptables -N fooX1234 ; then - qt iptables -A fooX1234 -m pkttype --pkt-type broadcast -j ACCEPT || PKTTYPE= - - qt iptables -F fooX1234 - qt iptables -X fooX1234 - fi - fi } report_capability() # $1 = Capability Name, $2 Capability Setting (if any)