From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 15 Aug 2008 22:04:53 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46586fc0f24e24166a52c2a0efb3e2ab838eea81;p=monkeysphere.git

Merge commit 'dkg/master'

Conflicts:

	debian/changelog
---

46586fc0f24e24166a52c2a0efb3e2ab838eea81
diff --cc debian/changelog
index b39ba44,e6dfccd..64c2a09
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,7 -5,8 +5,7 @@@ monkeysphere (0.8-1) UNRELEASED; urgenc
      of my own.
    * More monkeysphere-server diagnostics
    * monkeysphere --gen-subkey now guesses what KeyID you meant.
--  * set up host-key revocation
+   * added Recommends: ssh-askpass to ensure monkeysphere --gen-subkey works
  
    [ Jameson Graef Rollins ]
    * fix another bug for when ssh key files are missing.
diff --cc src/monkeysphere-server
index 4fb8265,2b9b744..69395a4
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@@ -732,7 -678,7 +732,7 @@@ EO
  	)
  
      # ltsign the key
--    echo "$ltsignCommand" | gpg_host --quiet --command-fd 0 --edit-key "$fingerprint"
++    echo "$ltsignCommand" | gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}"\!
  
      # update the trustdb for the authentication keyring
      gpg_authentication "--check-trustdb"