summaryrefslogtreecommitdiff
path: root/src/monkeysphere
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 14:52:20 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 15:17:41 -0400
commit62ff87e0328bc1406979656029a5e313839cac35 (patch)
tree00520511a7d868a5cf93a3036db282050c34134f /src/monkeysphere
parentc32302172e3533b2170329206ff011d6e3a26a49 (diff)
Add log output for keyserver checking.
Fix bug in proxy command to export CHECK_KEYSERVER variable.
Diffstat (limited to 'src/monkeysphere')
-rwxr-xr-xsrc/monkeysphere1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index a6ca62d..230de06 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -113,6 +113,7 @@ MS_CONF=${MS_CONF:-"${MS_HOME}/monkeysphere.conf"}
AUTHORIZED_USER_IDS=${AUTHORIZED_USER_IDS:-"${MS_HOME}/authorized_user_ids"}
GNUPGHOME=${GNUPGHOME:-"${HOME}/.gnupg"}
KEYSERVER=${KEYSERVER:-"subkeys.pgp.net"}
+CHECK_KEYSERVER=${CHECK_KEYSERVER:="true"}
REQUIRED_HOST_KEY_CAPABILITY=${REQUIRED_HOST_KEY_CAPABILITY:-"e a"}
REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-"${HOME}/.ssh/authorized_keys"}