From 20cd943a600d8ddf963addd7c8d58dce992b4c42 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 20 Oct 2011 10:32:09 -0700 Subject: [PATCH] Make route-table copying work on IPv6 Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Providers.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 69d8892f9..7778a86a5 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -149,9 +149,9 @@ sub copy_table( $$$ ) { emit ''; if ( $realm ) { - emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//' | while read net route; do" ) + emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//; s/ cache / /' | while read net route; do" ) } else { - emit ( "\$IP -$family -o route show table $duplicate | ${filter}while read net route; do" ) + emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ cache / /' | ${filter}while read net route; do" ) } emit ( ' case $net in', @@ -183,9 +183,9 @@ sub copy_and_edit_table( $$$$ ) { emit ''; if ( $realm ) { - emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]]+//' | while read net route; do" ) + emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ realm [[:alnum:]]+//; s/ cache / /' | while read net route; do" ) } else { - emit ( "\$IP -$family -o route show table $duplicate | ${filter}while read net route; do" ) + emit ( "\$IP -$family -o route show table $duplicate | sed -r 's/ cache / /' | ${filter}while read net route; do" ) } emit ( ' case $net in',