summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-03-07 12:59:36 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-03-07 12:59:36 -0500
commitcea48901e37c2c6a370cbbdb5ceee2e197182c71 (patch)
tree20d94ba333dc17e840c1b855d953322ed527c828 /src/share
parent468c49b6fed363f509fc86dfd8241b705ec6c096 (diff)
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.
Diffstat (limited to 'src/share')
-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.