Merge commit 'jrollins/master'

diff --git a/.gitignore b/.gitignore
index eb4b70664ebf4b4d92b6e8e77ae002c689972069..8316a5cbcaa767e149b79ee1616cac24ec1627e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 873b0587785f389c263c7ea578cb973daeaeaac2..093c15713d59e025e6200ebe85e4b149d8e1d630 100644 (file)
--- 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 f721108ef5e9d59688566d0dd1a539cb5853823f..2e3bc16f8e96180d67f6f3d17429295163356a47 100755 (executable)
--- 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 85ff04fc5ddd31b74c0c776530ee4f043afb53d6..5b981537db831c2c26f280662b8f61b5ff594ee5 100755 (executable)
--- 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 6136399643eb70e46da8e19df0b1485d49e821a8..507b47f8f73eabfd6a62e7d9feaf4d53d12bca84 100755 (executable)
--- 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 abe068ddc9467aa1aae7c4679ce724a84278e3ec..7ab4bec1331e265eb5b7185cc7eac0b6b753b871 100644 (file)
--- 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.

diff --git a/website/sidebar.mdwn b/website/sidebar.mdwn
index 4783d2a7ee20b3bfbf9c196dbf3d6720b139a89a..181900709ce301d51eb23addfb6af74dc6937255 100644 (file)
--- a/website/sidebar.mdwn
+++ b/website/sidebar.mdwn
@@ -7,6 +7,7 @@
 <td>
 [[WHY?|why]]
 [[DOWNLOAD|download]]
+<a href="http://screenshots.debian.net/package/monkeysphere">SCREENSHOTS</a>
 [[DOCUMENTATION|doc]] 
 [[NEWS|news]]
 [[COMMUNITY|community]]