From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 24 Jun 2008 04:42:37 +0000 (-0400)
Subject: Small tweaks to prepare for upcoming changes.
X-Git-Tag: monkeysphere_0.3-1^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2253eae310120e49e0ae93cec273b48c0d8f26a8;p=monkeysphere.git

Small tweaks to prepare for upcoming changes.
---

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a198c33..b711fc5 100755
--- 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"