From 1642d62841486ade88ec2c48dd581e3249c98c94 Mon Sep 17 00:00:00 2001 From: Vasilii Kolobkov Date: Thu, 19 Jul 2018 18:55:57 +0200 Subject: [PATCH] Use the same mh_hostname() function from test/common.h in mhsign(1) --- uip/mhsign.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uip/mhsign.sh b/uip/mhsign.sh index 39a3f69..894ca5e 100755 --- a/uip/mhsign.sh +++ b/uip/mhsign.sh @@ -101,6 +101,12 @@ lookupkeyring() { return 0 } +### Do a best guess at FQDN +mh_hostname() +{ + hostname -f 2>/dev/null || uname -n +} + ### lookupkeys file -- set $KL to list of recipient keys lookupkeys() { KL= @@ -120,7 +126,7 @@ lookupkeys() { '|'*) echo "Ignoring pipe address" >&2 continue ;; *@*) ;; - *) i="$i@`hostname -f`" ;; + *) i="$i@`mh_hostname`" ;; esac if k=`lookupkeyfile "$i"` ; then KL="$KL $k" -- 1.7.10.4