From 62374dd1c16a2719202955ad3fe878be5cc14dba Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 18 Feb 2009 20:56:14 -0500
Subject: new msmktempdir function, to simplify making temporary directories.
remove MHTMPDIR, since it's not needed.
---
src/monkeysphere-host | 6 +-----
src/share/common | 5 +++++
src/share/m/gen_subkey | 2 +-
src/share/m/import_subkey | 2 +-
src/share/m/subkey_to_ssh_agent | 2 +-
src/share/mh/add_revoker | 2 +-
src/share/mh/import_key | 1 -
src/share/mh/publish_key | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'src')
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 7e8dd27..a86a8c9 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -32,10 +32,6 @@ MHSHAREDIR="${SYSSHAREDIR}/mh"
# datadir for host functions
MHDATADIR="${SYSDATADIR}/host"
-# temp directory for temp gnupghome directories for add_revoker
-MHTMPDIR="${MHDATADIR}/tmp"
-export MHTMPDIR
-
# host pub key files
HOST_KEY_FILE="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
@@ -171,7 +167,7 @@ show_key() {
local GNUPGHOME
# tmp gpghome dir
- export GNUPGHOME=$(mktemp -d)
+ export GNUPGHOME=$(msmktempdir)
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
diff --git a/src/share/common b/src/share/common
index 4120259..6b7d51b 100644
--- a/src/share/common
+++ b/src/share/common
@@ -134,6 +134,11 @@ cutline() {
head --line="$1" "$2" | tail -1
}
+# make a temporary directly
+msmktempdir() {
+ mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
+}
+
# this is a wrapper for doing lock functions.
#
# it lets us depend on either lockfile-progs (preferred) or procmail's
diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey
index cbefaa3..19d384d 100644
--- a/src/share/m/gen_subkey
+++ b/src/share/m/gen_subkey
@@ -114,7 +114,7 @@ EOF
)
log verbose "generating subkey..."
- fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
+ fifoDir=$(msmktempdir)
(umask 077 && mkfifo "$fifoDir/pass")
echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey
index aa89958..8b04456 100644
--- a/src/share/m/import_subkey
+++ b/src/share/m/import_subkey
@@ -42,7 +42,7 @@ Type '$PGRM help' for usage."
done
log verbose "importing ssh key..."
- fifoDir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
+ fifoDir=$(msmktempdir)
(umask 077 && mkfifo "$fifoDir/pass")
ssh2openpgp | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
diff --git a/src/share/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent
index 012c95f..a92718e 100644
--- a/src/share/m/subkey_to_ssh_agent
+++ b/src/share/m/subkey_to_ssh_agent
@@ -64,7 +64,7 @@ You might want to run 'gpg --gen-key'."
You might want to 'monkeysphere gen-subkey'"
fi
- workingdir=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
+ workingdir=$(msmktempdir)
umask 077
mkfifo "$workingdir/passphrase"
keysuccess=1
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index dfce4e1..bdcb749 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -53,7 +53,7 @@ if [ -f "$keyID" ] ; then
fi
else
# create a temporary directory for storing the downloaded key
- TMPLOC=$(mktemp -d "${MHTMPDIR}"/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
+ TMPLOC=$(msmktempdir) || failure "Could not create temporary directory!"
# download the key from the keyserver as the monkeysphere user
su_monkeysphere_user \
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 266bf05..cca40fa 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -39,7 +39,6 @@ userID="ssh://${hostName}"
# create host home
mkdir -p "${MHDATADIR}"
-mkdir -p "${MHTMPDIR}"
mkdir -p "${GNUPGHOME_HOST}"
chmod 700 "${GNUPGHOME_HOST}"
diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index b433ad7..37b8a72 100644
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -27,7 +27,7 @@ else
fi
# create a temporary gnupg directory from which to publish the key
-export GNUPGHOME=$(mktemp -d)
+export GNUPGHOME=$(msmktempdir)
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
--
cgit v1.2.3