From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 18 Jan 2010 22:07:11 +0000 (-0500)
Subject: got rid of monkeysphere-host fprs file
X-Git-Tag: monkeysphere_0.28~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44e57bfc7bef4b27d66651f09c9af697e3ce4b5c;p=monkeysphere.git

got rid of monkeysphere-host fprs file
---

diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index f3c5943..79da91b 100644
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -213,14 +213,12 @@ If set to `false', never prompt the user for confirmation. (true)
 System monkeysphere\-host config file.
 .TP
 /var/lib/monkeysphere/host_keys.pub.gpg
-A world-readable copy of the host's OpenPGP public keyring in
-ASCII armored format.  This includes the public key certificates,
-including all relevant self-signatures, of all host keys and host key
-revokers.
-.TP
-/var/lib/monkeysphere/host_keys.pub.fprs
-A world-readable file containing the OpenPGP fingerprints of all host
-keys, one per line.
+
+A world-readable copy of the host's OpenPGP certificates in ASCII
+armored format.  This includes the certificates (including the public
+keys, servicename-based User IDs, and most recent relevant
+self-signatures) corresponding to every key used by
+Monkeysphere-enabled services on the host.
 .TP
 /var/lib/monkeysphere/host/
 A locked directory (readable only by the superuser) containing copies
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index a580ef2..ef4107a 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -92,10 +92,9 @@ gpg_host_edit() {
 # export the monkeysphere gpg pub key file
 update_gpg_pub_file() {
     log debug "updating openpgp public key file '$HOST_KEY_FILE'..."
-    gpg_host --export --armor --export-options export-minimal > "$HOST_KEY_FILE"
-    log debug "updating fingerprint file '$HOST_KEY_FPR_FILE'..."
-    gpg_host --list-secret-key --with-colons --with-fingerprint \
-	| awk -F: '/^fpr:/{ print $10 }' > "$HOST_KEY_FPR_FILE"
+    gpg_host --export --armor --export-options export-minimal \
+        $(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr | cut -f9 -d:) \
+        > "$HOST_KEY_FILE"
 }
 
 host_fingerprints() {