X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmonkeysphere-server;h=e78903b8e1d6cce2725e7c04a881cff3ae027a79;hb=7833a5e9da4c6e15eea7edfc38ae122360b37f1f;hp=0b63e5cefb476f637642ba46ee4bec58bb6c8600;hpb=f83f5532fb1cec60741ce07cf90df4abdf5b2c1f;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 0b63e5c..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
@@ -230,7 +230,7 @@ update_users() {
 	# add user-controlled authorized_keys file if specified
 	# translate ssh-style path variables
 	rawAuthorizedKeys=$(translate_ssh_variables "$uname" "$RAW_AUTHORIZED_KEYS")
-	if [ "$rawAuthorizedKeys" ] ; then
+	if [ "$rawAuthorizedKeys" != 'none' ] ; then
 	    log debug "checking for raw authorized_keys..."
 	    if [ -s "$rawAuthorizedKeys" ] ; then
 		# check permissions on the authorized_keys file path