diff options
| author | Matthew James Goins <mjgoins@openflows.com> | 2010-03-14 17:40:46 -0400 |
|---|---|---|
| committer | Matthew James Goins <mjgoins@openflows.com> | 2010-03-14 17:40:46 -0400 |
| commit | dd71f5ec4a69c58f894f4f6961ca3786a192bc62 (patch) | |
| tree | 1e5bb5331837afcf9f77187daaaebf15c93606d7 /etc | |
| parent | 970c7500631f46b5aa6279bf607c7d11ede7549e (diff) | |
| parent | 3d46f5954da2bc9a2dd8d2ce35713136149c2983 (diff) | |
Merge remote branch 'dkg/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/monkeysphere.conf | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf index 53adf83..ce6e82a 100644 --- a/etc/monkeysphere.conf +++ b/etc/monkeysphere.conf @@ -21,10 +21,11 @@ # Set whether or not to check keyservers at every monkeysphere # interaction, including all ssh connections if you use the -# monkeysphere ssh-proxycommand. -# NOTE: setting CHECK_KEYSERVER to true will leak information about -# the timing and frequency of your ssh connections to the maintainer -# of the keyserver. +# monkeysphere ssh-proxycommand. Leave unset for default behavior +# (see KEYSERVER CHECKING in monkeysphere(1)), or set to true or false. +# NOTE: setting CHECK_KEYSERVER explicitly to true will leak +# information about the timing and frequency of your ssh connections +# to the maintainer of the keyserver. #CHECK_KEYSERVER=true # The path to the SSH known_hosts file. @@ -36,3 +37,7 @@ # The path to the SSH authorized_keys file. #AUTHORIZED_KEYS=~/.ssh/authorized_keys + +# Set to true to enable validation agent during X session startup +# where available. +#USE_VALIDATION_AGENT=false |