From 126bfc23c43e10b957e5dc0761697afc96968aef Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 29 Apr 2004 18:13:47 +0000 Subject: [PATCH] Avoid ipv6 warnings git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1294 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/firewall | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Shorewall2/firewall b/Shorewall2/firewall index dfbad4673..00b4d64f7 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -1169,12 +1169,16 @@ setup_forwarding() { # Disable IPV6 # disable_ipv6() { - if qt which ip6tables; then - ip6tables -P FORWARD DROP && save_command ip6tables -P FORWARD DROP - ip6tables -P INPUT DROP && save_command ip6tables -P INPUT DROP - ip6tables -P OUTPUT DROP && save_command ip6tables -P OUTPUT DROP - else - error_message "WARNING: DISABLE_IPV6=Yes in shorewall.conf but this system does not appear to have ip6tables" + local foo=$(ip -f inet6 addr ls 2> /dev/null) + + if [ -n "$foo" ]; then + if qt which ip6tables; then + ip6tables -P FORWARD DROP && save_command ip6tables -P FORWARD DROP + ip6tables -P INPUT DROP && save_command ip6tables -P INPUT DROP + ip6tables -P OUTPUT DROP && save_command ip6tables -P OUTPUT DROP + else + error_message "WARNING: DISABLE_IPV6=Yes in shorewall.conf but this system does not appear to have ip6tables" + fi fi }