Small tweaks to prepare for upcoming changes.

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a198c33c762e7dd005f7c2f80e164cc662c6d7b2..b711fc56aef00d2df4f518bf6137266d4199a668 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -158,6 +158,7 @@ MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere-server.conf}
 [ -e "$MS_CONF" ] && . "$MS_CONF"
 
 # set empty config variable with defaults
+MONKEYSPHERE_USER=${MONKEYSPHERE_USER:-"monkeysphere"}
 KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
 CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
 AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"%h/.config/monkeysphere/authorized_user_ids"}
@@ -168,7 +169,9 @@ REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 GNUPGHOME_HOST=${GNUPGHOME_HOST:-"${VARLIB}/gnupg-host"}
 GNUPGHOME_AUTHENTICATION=${GNUPGHOME_AUTHENTICATION:-"${VARLIB}/gnupg-authentication"}
 
-# set default GNUPGHOME, and make sure the directory exists
+# set default GNUPGHOME, and make sure the directory exists.  this is
+# true for all functions expect user authentication
+# (ie. update-users).
 GNUPGHOME="$GNUPGHOME_HOST"
 export GNUPGHOME
 mkdir -p -m 0700 "$GNUPGHOME"