From f1d415be134552e909510a1e0af39b1881d1a717 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 27 Jun 2006 20:24:50 +0000
Subject: [PATCH] Correct address list display in masq messages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4171 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler  | 2 +-
 Shorewall/functions | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index 51ab207f5..43e916b83 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -6492,7 +6492,7 @@ __EOF__
 __EOF__
 	    done
 
-	    if [ -n "$addresses" -a "$addresses" != detect ]; then
+	    if [ -n "$addresses" ]; then
 		message="   To $destination $displayproto from \$network through ${interface} using $addresses"
 	    else
 		message="   To $destination $displayproto from \$network through ${interface}"
diff --git a/Shorewall/functions b/Shorewall/functions
index 4c57e8a1b..736c66e3d 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -1136,7 +1136,7 @@ find_first_interface_address_if_any() # $1 = interface
 #
 find_interface_addresses() # $1 = interface
 {
-    ip -f inet addr show $1 | grep inet\  | sed 's/inet //;s/\/.*//;s/ peer.*//'
+    ip -f inet addr show $1 | grep inet\  | sed 's/\s*inet //;s/\/.*//;s/ peer.*//'
 }
 
 #