diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | packaging/debian/changelog | 7 | ||||
| -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 |
6 files changed, 17 insertions, 8 deletions
@@ -1,10 +1,5 @@ *~ *.[ao] -debian/files -debian/monkeysphere.debhelper.log -debian/monkeysphere.substvars -debian/monkeysphere/ -src/keytrans/openpgp2ssh repo/db repo/dists repo/pool diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 873b058..093c157 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,10 @@ +monkeysphere (0.25-1~pre) UNRELEASED; urgency=low + + * New upstream release: + - fix the marginal ui output so that it's not prefixed by the LOG_PREFIX + + -- Jameson Graef Rollins <jrollins@finestructure.net> Sat, 07 Mar 2009 12:28:13 -0500 + monkeysphere (0.24-1) unstable; urgency=low * New upstream release: 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. |