X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fpublish_key;h=f1c17234f819477b74e272bb1c37fac493b4e6b7;hb=7dbd6806e538ff8732dd87fcf20bfd8271464552;hp=b433ad726195554e454dd030ddf6a4256b3a7c99;hpb=d2874b94fedbe6d043d44ca3562879251e6ea10f;p=monkeysphere.git

diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index b433ad7..f1c1723 100644
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -8,37 +8,41 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008-2009, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2010, and are all released under the GPL,
+# version 3 or later.
 
-# publish server key to keyserver
+# publish keys to keyserver
 
 publish_key() {
 
+local keyID="$1"
 local GNUPGHOME
 
-if [ "$PROMPT" = "true" ] ; then
-    read -p "Really publish host key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
-    if [ ${OK/y/Y} != 'Y' ] ; then
+if [ "$PROMPT" != "false" ] ; then
+    printf "Really publish key '$keyID' to $KEYSERVER? (Y/n) " >&2
+    read OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "key not published."
     fi
 else
-    log debug "publishing key without prompting."
+    log debug "publishing key '$keyID' without prompting."
 fi
 
 # create a temporary gnupg directory from which to publish the key
-export GNUPGHOME=$(mktemp -d)
+export GNUPGHOME=$(msmktempdir)
+chmod 0700 "$GNUPGHOME"
+chown "$MONKEYSPHERE_USER":"$MONKEYSPHERE_GROUP" "$GNUPGHOME"
 
 # trap to remove tmp dir if break
 trap "rm -rf $GNUPGHOME" EXIT
 
-# import the host key into the tmp dir
+# import the key into the tmp dir
 su_monkeysphere_user \
     "gpg --quiet --import" <"$HOST_KEY_FILE"
 
-# publish host key
+# publish key
 su_monkeysphere_user \
-    "gpg --keyserver $KEYSERVER --send-keys '0x${HOST_FINGERPRINT}!'"
+    "gpg --keyserver $KEYSERVER --send-keys '0x${keyID}!'"
 
 # remove the tmp file
 trap - EXIT