summaryrefslogtreecommitdiff
path: root/src/share/m/ssh_proxycommand
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-07-23 00:48:19 -0400
committerJameson Graef Rollins <jrollins@finestructure.net>2009-07-23 00:48:19 -0400
commitaefed40bbe5844d4d41a301614889ea915aabe24 (patch)
treec40457356cfe9c701ab40650d6cb5943a6d30bd1 /src/share/m/ssh_proxycommand
parent1cf919e355b2cd7e4e154ddded802e01e8a12640 (diff)
proposed fix to marginal ui in case where host key not retrieved (should fix 1141)
Diffstat (limited to 'src/share/m/ssh_proxycommand')
-rw-r--r--src/share/m/ssh_proxycommand11
1 files changed, 7 insertions, 4 deletions
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}