4 files changed, 10 insertions, 3 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index f721108..2e3bc16 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -182,7 +182,9 @@ AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS}
 AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:="${MONKEYSPHERE_HOME}/authorized_user_ids"}
 REQUIRED_HOST_KEY_CAPABILITY=${MONKEYSPHERE_REQUIRED_HOST_KEY_CAPABILITY:="a"}
 REQUIRED_USER_KEY_CAPABILITY=${MONKEYSPHERE_REQUIRED_USER_KEY_CAPABILITY:="a"}
-LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
+# note that only using '=' instead of ':=' tests only if the variable
+# in unset, not if it's "null"
+LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX='ms: '}
 
 # export GNUPGHOME and make sure gpg home exists with proper
 # permissions
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 85ff04f..5b98153 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -144,6 +144,7 @@ export GNUPGHOME_CORE
 export GNUPGHOME_SPHERE
 export GNUPGHOME
 export CORE_KEYLENGTH
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index b052ca1..da7fc9c 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -242,6 +242,7 @@ export PROMPT
 export GNUPGHOME_HOST
 export GNUPGHOME
 export HOST_FINGERPRINT
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"
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.