enabled host key publication. be aware.

diff --git a/debian/changelog b/debian/changelog
index 0d6155ead9ca9cd6a6cfa73d04c0eefa71fb6a60..160d1d64f362c3f5500297226f0247ecaa812ca1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
   * sort processed keys so that "good" keys are processed after "bad"
     keys.  This will prevent malicious bad keys from causing good keys to
     be removed from key files.
+  * enabled host key publication.
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Thu, 14 Aug 2008 21:12:43 -0700
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Fri, 15 Aug 2008 00:48:22 -0700
 
 monkeysphere (0.7-1) experimental; urgency=low
 

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 598c3f7444593d06f67f82e10a517928e62a5db3..3259e3360166b0776c49d3e6b344b817587d1820 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -414,20 +414,19 @@ revoke_hostname() {
 
 # publish server key to keyserver
 publish_server_key() {
-    read -p "Really publish key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
+    read -p "Really publish host key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
     if [ ${OK/y/Y} != 'Y' ] ; then
        failure "aborting."
     fi
 
+    # find the key fingerprint
+    fingerprint=$(fingerprint_server_key)
+
     # publish host key
     # FIXME: need to figure out better way to identify host key
     # dummy command so as not to publish fakes keys during testing
     # eventually:
-    #gpg_authentication "--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)"
-    echo "NOT PUBLISHED (to avoid permanent publication errors during monkeysphere development)."
-    echo "The following command should publish the key:"
-    echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)'"
-    exit 255
+    gpg_authentication "--keyserver $KEYSERVER --send-keys $fingerprint"
 }
 
 diagnostics() {