summaryrefslogtreecommitdiff
path: root/src/share/m
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-10 17:40:07 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-10 17:40:07 -0400
commitaff684f1821f4145c5aea4ced28c8f3b44051791 (patch)
tree55bf401e13beb70ba5a8debc9e1933faf51ac7da /src/share/m
parent23b12bdbdf959fdc304fa10bae9836dae1e87f49 (diff)
parent4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588 (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'src/share/m')
-rw-r--r--src/share/m/ssh_proxycommand7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/share/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index abe068d..7ab4bec 100644
--- a/src/share/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
@@ -18,9 +18,9 @@
# "marginal case" ouput in the case that there is not a full
# validation path to the host
output_no_valid_key() {
- local returnCode=0
- local sshKeyOffered
local userID
+ local sshKeyOffered
+ local gpgOut
local type
local validity
local keyid
@@ -30,9 +30,12 @@ output_no_valid_key() {
local tmpkey
local sshFingerprint
local gpgSigOut
+ local returnCode=0
userID="ssh://${HOSTP}"
+ LOG_PREFIX=
+
cat <<EOF | log info
-------------------- Monkeysphere warning -------------------
Monkeysphere found OpenPGP keys for this hostname, but none had full validity.