From cea48901e37c2c6a370cbbdb5ceee2e197182c71 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 7 Mar 2009 12:59:36 -0500
Subject: fix the marginal ui output so that it's not prefixed by the
 LOG_PREFIX.  also make sure to always export the LOG_PREFIX, so that it gets
 passed to subprocces su_monkeysphere_user.

---
 src/share/m/ssh_proxycommand | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/share/m/ssh_proxycommand')

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.
-- 
cgit v1.2.3