Correct address list display in masq messages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4171 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-27 20:24:50 +00:00
parent dcefe79ca7
commit f1d415be13
2 changed files with 2 additions and 2 deletions

View File

@ -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}"

View File

@ -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.*//'
}
#