diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-07-11 19:04:05 -0400 |
---|---|---|
committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-07-11 19:04:05 -0400 |
commit | 0e288e3ce07ff84830aeaa414191666fad55db6b (patch) | |
tree | 563dc8669574489be4efdc4cf7c2ead745daa665 /src/monkeysphere-host | |
parent | 0538dfc4b534ecc9e6d660bdb540abdbfdf97268 (diff) | |
parent | 56f591cdd4f4e7032d573f2942f7b6cf3a01c8c2 (diff) |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/monkeysphere-host')
-rwxr-xr-x | src/monkeysphere-host | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host index 507b47f..d498065 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -226,6 +226,7 @@ LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=$LOG_LEVEL} KEYSERVER=${MONKEYSPHERE_KEYSERVER:=$KEYSERVER} CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER} MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=$MONKEYSPHERE_USER} +MONKEYSPHERE_GROUP=$(get_primary_group "$MONKEYSPHERE_USER") PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT} # other variables @@ -238,6 +239,7 @@ export LOG_LEVEL export KEYSERVER export CHECK_KEYSERVER export MONKEYSPHERE_USER +export MONKEYSPHERE_GROUP export PROMPT export GNUPGHOME_HOST export GNUPGHOME @@ -304,6 +306,7 @@ case $COMMAND in ;; 'diagnostics'|'d') + check_host_no_key load_fingerprint source "${MHSHAREDIR}/diagnostics" diagnostics |