summaryrefslogtreecommitdiff
path: root/man/man8/monkeysphere-authentication.8
diff options
context:
space:
mode:
authorMatthew James Goins <mjgoins@openflows.com>2010-03-14 17:40:46 -0400
committerMatthew James Goins <mjgoins@openflows.com>2010-03-14 17:40:46 -0400
commitdd71f5ec4a69c58f894f4f6961ca3786a192bc62 (patch)
tree1e5bb5331837afcf9f77187daaaebf15c93606d7 /man/man8/monkeysphere-authentication.8
parent970c7500631f46b5aa6279bf607c7d11ede7549e (diff)
parent3d46f5954da2bc9a2dd8d2ce35713136149c2983 (diff)
Merge remote branch 'dkg/master'
Diffstat (limited to 'man/man8/monkeysphere-authentication.8')
-rw-r--r--man/man8/monkeysphere-authentication.87
1 files changed, 6 insertions, 1 deletions
diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index b2dfbdf..ea9debd 100644
--- a/man/man8/monkeysphere-authentication.8
+++ b/man/man8/monkeysphere-authentication.8
@@ -177,6 +177,11 @@ false may expose users to abuse by other users on the system. (true)
/etc/monkeysphere/monkeysphere\-authentication.conf
System monkeysphere-authentication config file.
.TP
+/etc/monkeysphere/monkeysphere\-authentication\-x509\-anchors.crt
+If monkeysphere-authentication is configured to query an hkps
+keyserver, it will use X.509 Certificate Authority certificates in
+this file to validate any X.509 certificates used by the keyserver.
+.TP
/var/lib/monkeysphere/authorized_keys/USER
Monkeysphere-generated user authorized_keys files.
.TP
@@ -189,7 +194,7 @@ added to the given user's authorized_keys file.
.SH AUTHOR
This man page was written by:
-Jameson Rollins <jrollins@fifthhorseman.net>,
+Jameson Rollins <jrollins@finestructure.net>,
Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
Matthew Goins <mjgoins@openflows.com>