From 5fbc5f14300329e607b6b7251e2c131176881619 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 2 May 2016 07:25:37 -0700 Subject: [PATCH] Apply Paul Gear's patch for Ubuntu 16.04 Signed-off-by: Tom Eastep --- Shorewall/Perl/lib.core | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/lib.core b/Shorewall/Perl/lib.core index dc95b3acc..d32b3b3b3 100644 --- a/Shorewall/Perl/lib.core +++ b/Shorewall/Perl/lib.core @@ -1110,7 +1110,7 @@ interface_is_usable() # $1 = interface # find_interface_addresses() # $1 = interface { - $IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 2' | sed 's/\s*inet6 //;s/\/.*//;s/ peer.*//' + $IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 2' | sed 's/\s*inet6 //;s/\/.*//;s/ peer [0-9a-f:]*//' } # @@ -1119,7 +1119,7 @@ find_interface_addresses() # $1 = interface find_interface_full_addresses() # $1 = interface { - $IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 ' | sed 's/\s*inet6 //;s/ scope.*//;s/ peer.*//' + $IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 ' | sed 's/\s*inet6 //;s/ scope.*//;s/ peer [0-9a-f:]*//' } #