From: Vasilii Kolobkov <polezaivsani@ko5v.net>
Date: Thu, 19 Jul 2018 16:55:57 +0000 (+0200)
Subject: Use the same mh_hostname() function from test/common.h in mhsign(1)
X-Git-Tag: mmh-0.4~23
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=1642d62841486ade88ec2c48dd581e3249c98c94;p=mmh

Use the same mh_hostname() function from test/common.h in mhsign(1)
---

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"