summaryrefslogtreecommitdiff
path: root/src/monkeysphere
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-03-07 12:59:36 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-03-07 12:59:36 -0500
commitcea48901e37c2c6a370cbbdb5ceee2e197182c71 (patch)
tree20d94ba333dc17e840c1b855d953322ed527c828 /src/monkeysphere
parent468c49b6fed363f509fc86dfd8241b705ec6c096 (diff)
fix the marginal ui output so that it's not prefixed by the
LOG_PREFIX. also make sure to always export the LOG_PREFIX, so that it gets passed to subprocces su_monkeysphere_user.
Diffstat (limited to 'src/monkeysphere')
-rwxr-xr-xsrc/monkeysphere4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index f721108..2e3bc16 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -182,7 +182,9 @@ AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS}
AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:="${MONKEYSPHERE_HOME}/authorized_user_ids"}
REQUIRED_HOST_KEY_CAPABILITY=${MONKEYSPHERE_REQUIRED_HOST_KEY_CAPABILITY:="a"}
REQUIRED_USER_KEY_CAPABILITY=${MONKEYSPHERE_REQUIRED_USER_KEY_CAPABILITY:="a"}
-LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
+# note that only using '=' instead of ':=' tests only if the variable
+# in unset, not if it's "null"
+LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX='ms: '}
# export GNUPGHOME and make sure gpg home exists with proper
# permissions