projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
88b1956
)
new msmktempdir function, to simplify making temporary directories. remove MHTMPDIR...
author
Jameson Graef Rollins
<jrollins@finestructure.net>
Thu, 19 Feb 2009 01:56:14 +0000
(20:56 -0500)
committer
Jameson Graef Rollins
<jrollins@finestructure.net>
Thu, 19 Feb 2009 01:56:14 +0000
(20:56 -0500)
src/monkeysphere-host
patch
|
blob
|
history
src/share/common
patch
|
blob
|
history
src/share/m/gen_subkey
patch
|
blob
|
history
src/share/m/import_subkey
patch
|
blob
|
history
src/share/m/subkey_to_ssh_agent
patch
|
blob
|
history
src/share/mh/add_revoker
patch
|
blob
|
history
src/share/mh/import_key
patch
|
blob
|
history
src/share/mh/publish_key
patch
|
blob
|
history
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index 7e8dd27caa82ccf74911a7543f9d198090fb4f57..a86a8c91d27ad30b283b261976ad60e0522ff222 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-32,10
+32,6
@@
MHSHAREDIR="${SYSSHAREDIR}/mh"
# datadir for host functions
MHDATADIR="${SYSDATADIR}/host"
# 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"
# 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
local GNUPGHOME
# tmp gpghome dir
- export GNUPGHOME=$(m
ktemp -d
)
+ export GNUPGHOME=$(m
smktempdir
)
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
diff --git
a/src/share/common
b/src/share/common
index 4120259b5f0054c6d42b5f69848cecb60b632e7f..6b7d51bab1f0b03e0d15b145daaae03052c01898 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-134,6
+134,11
@@
cutline() {
head --line="$1" "$2" | tail -1
}
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
# 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 cbefaa3ecbf518e34a44d3c04ab5c3b9f7bf7cf2..19d384ddc854935fab986735d3327138c39a7836 100644
(file)
--- a/
src/share/m/gen_subkey
+++ b/
src/share/m/gen_subkey
@@
-114,7
+114,7
@@
EOF
)
log verbose "generating subkey..."
)
log verbose "generating subkey..."
- fifoDir=$(m
ktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
)
+ fifoDir=$(m
smktempdir
)
(umask 077 && mkfifo "$fifoDir/pass")
echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
(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 aa89958a7d428344db9e23d5905fc1ae1d0eaec0..8b044568848c2ab6ca22a8717e6ed2b678b1e87c 100644
(file)
--- 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..."
done
log verbose "importing ssh key..."
- fifoDir=$(m
ktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
)
+ fifoDir=$(m
smktempdir
)
(umask 077 && mkfifo "$fifoDir/pass")
ssh2openpgp | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
(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 012c95f80f5bbce1640821fb3eada10e15b1b078..a92718efee93ce042fe82b848e0573c2df790365 100644
(file)
--- 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
You might want to 'monkeysphere gen-subkey'"
fi
- workingdir=$(m
ktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX
)
+ workingdir=$(m
smktempdir
)
umask 077
mkfifo "$workingdir/passphrase"
keysuccess=1
umask 077
mkfifo "$workingdir/passphrase"
keysuccess=1
diff --git
a/src/share/mh/add_revoker
b/src/share/mh/add_revoker
index dfce4e11f1a64b4b4c46e1d93f73531d5eda94df..bdcb749118141cb8ed9a14be434c963feeaa0803 100644
(file)
--- 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
fi
else
# create a temporary directory for storing the downloaded key
- TMPLOC=$(m
ktemp -d "${MHTMPDIR}"/tmp.XXXXXXXXXX
) || failure "Could not create temporary directory!"
+ TMPLOC=$(m
smktempdir
) || failure "Could not create temporary directory!"
# download the key from the keyserver as the monkeysphere user
su_monkeysphere_user \
# 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 266bf05ea1cdaa8537a6481f3fee6227756376d1..cca40fa09e7424af87f82a7f638901b052bf98b8 100644
(file)
--- 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}"
# create host home
mkdir -p "${MHDATADIR}"
-mkdir -p "${MHTMPDIR}"
mkdir -p "${GNUPGHOME_HOST}"
chmod 700 "${GNUPGHOME_HOST}"
mkdir -p "${GNUPGHOME_HOST}"
chmod 700 "${GNUPGHOME_HOST}"
diff --git
a/src/share/mh/publish_key
b/src/share/mh/publish_key
index b433ad726195554e454dd030ddf6a4256b3a7c99..37b8a72628ad741bff5e50e380495b6aadb47be6 100644
(file)
--- 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
fi
# create a temporary gnupg directory from which to publish the key
-export GNUPGHOME=$(m
ktemp -d
)
+export GNUPGHOME=$(m
smktempdir
)
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT