From 497ba428052f1437187778ceb2293c8eaba5893f Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 18 Apr 2010 20:22:27 +0200 Subject: 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. --- rcfile_y.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rcfile_y.y') diff --git a/rcfile_y.y b/rcfile_y.y index 607e6bd3..fe3a59d1 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -77,7 +77,7 @@ extern char * yytext; %token NO KEEP FLUSH LIMITFLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS %token DROPSTATUS DROPDELIVERED %token DNS SERVICE PORT UIDL INTERVAL MIMEDECODE IDLE CHECKALIAS -%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT +%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT %token PRINCIPAL ESMTPNAME ESMTPPASSWORD %token TRACEPOLLS @@ -344,6 +344,7 @@ user_option : TO localnames HERE | SSLCERT STRING {current.sslcert = prependdir ($2, rcfiledir); free($2);} | SSLPROTO STRING {current.sslproto = $2;} | SSLCERTCK {current.sslcertck = FLAG_TRUE;} + | SSLCERTFILE STRING {current.sslcertfile = prependdir($2, rcfiledir); free($2);} | SSLCERTPATH STRING {current.sslcertpath = prependdir($2, rcfiledir); free($2);} | SSLCOMMONNAME STRING {current.sslcommonname = $2;} | SSLFINGERPRINT STRING {current.sslfingerprint = $2;} -- cgit v1.2.3