fix CertificateFile docs & samples

the mbsync manual says explicitly that the system's default certificate
store should *not* be specified.
however, the isync manual talked about CA certificates, which is (and
always was) exactly wrong.
also adjust both .sample rc files.
This commit is contained in:
Oswald Buddenhagen 2015-11-06 08:29:05 +01:00
parent 89dc7592ee
commit e054c575ea
3 changed files with 7 additions and 3 deletions

View File

@ -259,7 +259,12 @@ established with the IMAP server. (Default: \fIyes\fR)
.. ..
.TP .TP
\fBCertificateFile\fR \fIpath\fR \fBCertificateFile\fR \fIpath\fR
File containing X.509 CA certificates used to verify server identities. File containing additional X.509 certificates used to verify server
identities. Directly matched peer certificates are always trusted,
regardless of validity.
.br
Note that the system's default certificate store is always used
and should not be specified here.
.. ..
.TP .TP
\fBUseSSLv2\fR \fIyes\fR|\fIno\fR \fBUseSSLv2\fR \fIyes\fR|\fIno\fR

View File

@ -3,7 +3,7 @@
# doesn't specify it. # doesn't specify it.
# SSL server certificate file # SSL server certificate file
CertificateFile /etc/ssl/certs/ca-certificates.crt CertificateFile ~/.isync.certs
# by default, expunge deleted messages (same as -e on command line) # by default, expunge deleted messages (same as -e on command line)
Expunge yes Expunge yes

View File

@ -26,7 +26,6 @@ Pass xxxxxxxx
# "Account Name" USERNAME # "Account Name" USERNAME
# "Password" PASSWORD # "Password" PASSWORD
#PassCmd "/usr/bin/security find-internet-password -w -a USERNAME -s IMAPSERVER ~/Library/Keychains/login.keychain" #PassCmd "/usr/bin/security find-internet-password -w -a USERNAME -s IMAPSERVER ~/Library/Keychains/login.keychain"
CertificateFile /etc/ssl/certs/ca-certificates.crt
Channel work Channel work
Master :work: Master :work: