making invocations of mktemp portable (FreeBSD does not have a default value for the [template] arg

3 files changed, 5 insertions, 5 deletions

diff --git a/src/common b/src/common
index 556dd5a..c8a7db6 100644
--- a/src/common
+++ b/src/common
@@ -726,7 +726,7 @@ process_host_known_hosts() {
 	    if [ "$HASH_KNOWN_HOSTS" = 'true' ] ; then
 		# FIXME: this is really hackish cause ssh-keygen won't
 		# hash from stdin to stdout
-		tmpfile=$(mktemp)
+		tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
 		ssh2known_hosts "$host" "$sshKey" > "$tmpfile"
 		ssh-keygen -H -f "$tmpfile" 2> /dev/null
 		cat "$tmpfile" >> "$KNOWN_HOSTS"
diff --git a/src/monkeysphere b/src/monkeysphere
index 512d608..36b44dd 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -147,7 +147,7 @@ EOF
 )
 
     log verbose "generating subkey..."
-    fifoDir=$(mktemp -d)
+    fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     (umask 077 && mkfifo "$fifoDir/pass")
     echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
 
@@ -210,7 +210,7 @@ You might want to run 'gpg --gen-key'."
 You might want to 'monkeysphere gen-subkey'"
     fi
 
-    workingdir=$(mktemp -d)
+    workingdir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     umask 077
     mkfifo "$workingdir/passphrase"
     keysuccess=1
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 4cda008..e590f3c 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -120,7 +120,7 @@ show_server_key() {
 
     # dumping to a file named ' ' so that the ssh-keygen output
     # doesn't claim any potentially bogus hostname(s):
-    tmpkey=$(mktemp -d)
+    tmpkey=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
     gpg_authentication "--export $fingerprint" | openpgp2ssh "$fingerprint" 2>/dev/null > "$tmpkey/ "
     echo -n "ssh fingerprint: "
     (cd "$tmpkey" && ssh-keygen -l -f ' ' | awk '{ print $2 }')
@@ -188,7 +188,7 @@ update_users() {
 	fi
 
         # make temporary directory
-        TMPDIR=$(mktemp -d)
+        TMPDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
 
 	# trap to delete temporary directory on exit
 	trap "rm -rf $TMPDIR" EXIT