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 /src/share/ma | |
| parent | 970c7500631f46b5aa6279bf607c7d11ede7549e (diff) | |
| parent | 3d46f5954da2bc9a2dd8d2ce35713136149c2983 (diff) | |
Merge remote branch 'dkg/master'
Diffstat (limited to 'src/share/ma')
| -rw-r--r-- | src/share/ma/list_certifiers | 2 | ||||
| -rw-r--r-- | src/share/ma/setup | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/share/ma/list_certifiers b/src/share/ma/list_certifiers index 38a3222..789eb9d 100644 --- a/src/share/ma/list_certifiers +++ b/src/share/ma/list_certifiers @@ -4,7 +4,7 @@ # Monkeysphere authentication list-certifiers subcommand # # The monkeysphere scripts are written by: -# Jameson Rollins <jrollins@fifthhorseman.net> +# Jameson Rollins <jrollins@finestructure.net> # Jamie McClelland <jm@mayfirst.org> # Daniel Kahn Gillmor <dkg@fifthhorseman.net> # diff --git a/src/share/ma/setup b/src/share/ma/setup index 6c75fef..f965487 100644 --- a/src/share/ma/setup +++ b/src/share/ma/setup @@ -43,6 +43,7 @@ EOF # Edits will be overwritten. no-greeting list-options show-uid-validity +keyserver-options ca-cert-file=${SYSCONFIGDIR}/monkeysphere-authentication-x509-anchors.crt EOF # make sure the monkeysphere user owns everything in the sphere |