summaryrefslogtreecommitdiff
path: root/src/monkeysphere-server
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2008-10-31 16:05:13 -0400
committerMatt Goins <mjgoins@openflows.com>2008-10-31 16:05:13 -0400
commit7f79f55addb03d438f1afebfc19be8086f7afc9a (patch)
tree80cc83b351ed3690f40c51d777d3ca3ec240cae5 /src/monkeysphere-server
parent680d7340d29d16325eb991feb37885d6faa955e2 (diff)
parentdbd07cf1282c4831f605924e9b13d34278db7f86 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'src/monkeysphere-server')
-rwxr-xr-xsrc/monkeysphere-server4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 5f0cb73..e78903b 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -134,7 +134,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 ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
+ tmpkey=$(mktemp -d ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
gpg_authentication "--export $fingerprint" | openpgp2ssh "$fingerprint" 2>/dev/null > "$tmpkey/ "
echo -n "ssh fingerprint: "
(cd "$tmpkey" && ssh-keygen -l -f ' ' | awk '{ print $2 }')
@@ -180,7 +180,7 @@ update_users() {
log verbose "----- user: $uname -----"
# make temporary directory
- TMPLOC=$(mktemp -d ${MSTMPDIR}/tmp.XXXXXXXXXX)
+ TMPLOC=$(mktemp -d ${MSTMPDIR}/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
# trap to delete temporary directory on exit
trap "rm -rf $TMPLOC" EXIT