diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-03-10 17:40:07 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-03-10 17:40:07 -0400 |
| commit | aff684f1821f4145c5aea4ced28c8f3b44051791 (patch) | |
| tree | 55bf401e13beb70ba5a8debc9e1933faf51ac7da /src | |
| parent | 23b12bdbdf959fdc304fa10bae9836dae1e87f49 (diff) | |
| parent | 4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588 (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/monkeysphere | 4 | ||||
| -rwxr-xr-x | src/monkeysphere-authentication | 1 | ||||
| -rwxr-xr-x | src/monkeysphere-host | 1 | ||||
| -rw-r--r-- | src/share/m/ssh_proxycommand | 7 |
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 6136399..507b47f 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. |