X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=8e6e81a5aeb85f887be2a304885979da3d1923cf;hb=01012ce201590e939a82fcc2aeda88fc6a34ad57;hp=7c928521e058c1c67824c9c98a674866d287e589;hpb=c39d11682121a43e690465d194a5bd9fa2275f42;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 7c92852..8e6e81a 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -68,7 +68,7 @@ gpg_user() {
 # output the ssh fingerprint of a gpg key
 gpg_ssh_fingerprint() {
     keyid="$1"
-    local tmpfile=$(mktemp)
+    local tmpfile=$(msmktempfile)
 
     # trap to remove tmp file if break
     trap "rm -f $tmpfile" EXIT
@@ -276,11 +276,13 @@ case $COMMAND in
 	;;
 
     'keys-for-userid'|'u')
+	CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
 	keys_for_userid "$@"
 	;;
 
     'keys-from-userid')
 	echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
+	CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
 	keys_for_userid "$@"
 	;;