X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhsign.sh;h=f28c0fecef5c976a910dc1c80d8da145b83e2189;hp=038052b368c7212f30543c6ddccdeea7d87ee601;hb=370cd86e50f3348d7ee0cc4a265764d002b15cdc;hpb=1ec0f1695f9f129210f7c3cdc0c85d329cc055df

diff --git a/uip/mhsign.sh b/uip/mhsign.sh
index 038052b..f28c0fe 100755
--- a/uip/mhsign.sh
+++ b/uip/mhsign.sh
@@ -9,7 +9,7 @@
 #              will be removed and any "From " line will be indented for
 #              best compatibility. Enforced for multipart messages.
 
-usage="Usage: mhsign [-encrypt] [-mime] file"
+usage="Usage: mhsign [-encrypt] [-mime] [-Version] [-help] file"
 
 # defaults
 usemime=n
@@ -108,14 +108,17 @@ lookupkeys() {
 		echo "Encryption is not supported for BCCs" >&2
 		return 1
 	fi
-		
-	for i in `whom -ali -tocc -nobcc "$1"` ; do
+
+	whom -ali -tocc -nobcc "$1" | while read i ; do
 		case "$i" in
 		'|'*)	echo "Ignoring pipe address" >&2
 			continue ;;
 		*@*)	;;
 		*)	i="$i@`hostname -f`" ;;
 		esac
+		# extract the actual address
+		format='%<{error}%{error}: %{text}%|%(addr{text})%>'
+		i=`%libdir%/ap -form "=$format" "$i"`
 		if k=`lookupkeyfile "$i"` ; then
 			KL="$KL $k"
 		elif k=`lookupkeyring "$i"` ; then