diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2010-04-18 20:22:27 +0200 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2010-04-18 20:22:27 +0200 |
| commit | 497ba428052f1437187778ceb2293c8eaba5893f (patch) | |
| tree | 353f899ae268adf5af1b878207bc72118128dcd8 /fetchmail.c | |
| parent | 6da324a5e02587c48cd527522d92a72b66b3b42e (diff) | |
| download | fetchmail-497ba428052f1437187778ceb2293c8eaba5893f.tar.gz fetchmail-497ba428052f1437187778ceb2293c8eaba5893f.tar.bz2 fetchmail-497ba428052f1437187778ceb2293c8eaba5893f.zip | |
Add --sslcertfile option and FETCHMAIL_NO_DEFAULT_X509_PATHS env var,
and always load the default X.509 trust stores, unless the latter is set.
Diffstat (limited to 'fetchmail.c')
| -rw-r--r-- | fetchmail.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fetchmail.c b/fetchmail.c index af2a5dda..6d63c714 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -981,6 +981,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(sslcert); FLAG_MERGE(sslproto); FLAG_MERGE(sslcertck); + FLAG_MERGE(sslcertfile); FLAG_MERGE(sslcertpath); FLAG_MERGE(sslcommonname); FLAG_MERGE(sslfingerprint); @@ -1667,9 +1668,11 @@ static void dump_params (struct runctl *runp, printf(GT_(" SSL protocol: %s.\n"), ctl->sslproto); if (ctl->sslcertck) { printf(GT_(" SSL server certificate checking enabled.\n")); - if (ctl->sslcertpath != NULL) - printf(GT_(" SSL trusted certificate directory: %s\n"), ctl->sslcertpath); } + if (ctl->sslcertfile != NULL) + printf(GT_(" SSL trusted certificate file: %s\n"), ctl->sslcertfile); + if (ctl->sslcertpath != NULL) + printf(GT_(" SSL trusted certificate directory: %s\n"), ctl->sslcertpath); if (ctl->sslcommonname != NULL) printf(GT_(" SSL server CommonName: %s\n"), ctl->sslcommonname); if (ctl->sslfingerprint != NULL) |