From f841083f6f8afa8583f92595aa84d381623c9f12 Mon Sep 17 00:00:00 2001 From: Philipp Takacs Date: Mon, 1 Aug 2016 13:14:47 +0200 Subject: [PATCH] mhsign should work now --- test/tests/mhsign/test-mhsign | 4 ++-- uip/mhsign.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/tests/mhsign/test-mhsign b/test/tests/mhsign/test-mhsign index 7654e5f..3c2bb97 100755 --- a/test/tests/mhsign/test-mhsign +++ b/test/tests/mhsign/test-mhsign @@ -66,9 +66,9 @@ unknownperson@example.org ! runandcheck "mhsign -enc $draft" < +Could not find key for Could not find key for -Could not find key for +Could not find key for Could not find key for Could not find key for Could not find key for diff --git a/uip/mhsign.sh b/uip/mhsign.sh index f28c0fe..9d6c747 100755 --- a/uip/mhsign.sh +++ b/uip/mhsign.sh @@ -109,16 +109,18 @@ lookupkeys() { return 1 fi - whom -ali -tocc -nobcc "$1" | while read i ; do + # extract the actual address + format='%<{error}%{error}: %{text}%|%(addr{text})%>' + addresses=`whom -ali -tocc -nobcc "$1" |sed 's_$_,_'` + addresses=`%libdir%/ap -form "=$format" "$addresses"` + + for i in $addresses ; 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 -- 1.7.10.4