mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-25 12:13:29 +02:00
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:
parent
dcefe79ca7
commit
f1d415be13
@ -6492,7 +6492,7 @@ __EOF__
|
|||||||
__EOF__
|
__EOF__
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -n "$addresses" -a "$addresses" != detect ]; then
|
if [ -n "$addresses" ]; then
|
||||||
message=" To $destination $displayproto from \$network through ${interface} using $addresses"
|
message=" To $destination $displayproto from \$network through ${interface} using $addresses"
|
||||||
else
|
else
|
||||||
message=" To $destination $displayproto from \$network through ${interface}"
|
message=" To $destination $displayproto from \$network through ${interface}"
|
||||||
|
@ -1136,7 +1136,7 @@ find_first_interface_address_if_any() # $1 = interface
|
|||||||
#
|
#
|
||||||
find_interface_addresses() # $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.*//'
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user