X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhsign.sh;h=038052b368c7212f30543c6ddccdeea7d87ee601;hp=9a060532e2ef4c23d48ab044b67625858090edb1;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=f36530fd658fd2ccfac328c5097f7b44712eceac

diff --git a/uip/mhsign.sh b/uip/mhsign.sh
index 9a06053..038052b 100755
--- a/uip/mhsign.sh
+++ b/uip/mhsign.sh
@@ -23,7 +23,12 @@ if [ -z "$userid" ] ; then
 fi
 if [ -z "$userid" ] ; then
 	userid="`gpg --list-secret-keys --with-colons 2>/dev/null |
-			sed -n '/^sec/{p;q;}' | cut -d: -f5`"
+			grep '^sec' | sort -t: -k3,3nr -k 6,6nr |
+			awk -F: '
+				$7=="" || $7 > "'"\`date +%Y-%m-%d\`"'" {
+					print $5; exit;
+				}
+			'`"
 fi
 if [ -z "$userid" ] ; then
 	echo "No secret key found" >&2
@@ -91,7 +96,7 @@ lookupkeyring() {
 	if [ $? != 0 ] ; then
 		return 1
 	fi
-	echo "$key" | sed -n '/^pub/{p;q;}' | cut -d: -f5
+	echo "$key" | sed -n '/^pub:[^idre]:/{p;q;}' | cut -d: -f5
 	return 0
 }