From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 23 Jul 2009 04:48:45 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~29
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=c8d0dccee22d1fe4e65edebbf624915c3fc8a8af;hp=6f59a15a6759ce26da5041669f2a3cb5a7e41fc2;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 322937b..01ca488 100644
--- a/src/share/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
@@ -102,8 +102,13 @@ EOF
     if [ -z "$sshKeyOffered" ] ; then
 	log info <<EOF
 Could not retrieve RSA host key from $HOST.
+EOF
+	# check that there are any marginally valid keys
+	if echo "$gpgOut" | egrep -q '^(pub|sub):(m|f|u):' ; then
+	    log info <<EOF
 The following keys were found with marginal validity:
 EOF
+	fi
     fi
 
     # find all 'pub' and 'sub' lines in the gpg output, which each
@@ -140,10 +145,9 @@ EOF
 		else
 
 		    # if the current key is marginal, show info
-		    if [ "$validity" = 'm' -o "$validity" = 'f' ] ; then
+		    if [ "$validity" = 'm' ] ; then
 			show_key_info "$keyid" | log info
                     fi
-
 		fi
 		;;
 	esac
@@ -163,10 +167,9 @@ None of the found keys matched the key offered by the host.
 EOF
 	else
 	    log info <<EOF
-There may be other keys with less than marginal validity for this hostname.
+There may be keys for this hostname with less than marginal validity.
 EOF
 	fi
-
 	log info <<EOF
 Run the following command for more info about the found keys:
 gpg --check-sigs --list-options show-uid-validity =${userID}