From 3948bb44ff30ebda9837480c42de7f0d384e4cb9 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Fri, 7 Mar 2008 13:16:58 +0000 Subject: Merge Daniel Richard G.'s --sslcommonname option. Exception from no-features policy on 6.3.X is made to keep people away from doing more dangerous things in order to get rid of CommonName mismatch warnings. svn path=/branches/BRANCH_6-3/; revision=5165 --- 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 300fcc7f..0e622002 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -76,7 +76,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 SSLFINGERPRINT +%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT %token PRINCIPAL ESMTPNAME ESMTPPASSWORD %token TRACEPOLLS @@ -338,6 +338,7 @@ user_option : TO localnames HERE | SSLPROTO STRING {current.sslproto = xstrdup($2);} | SSLCERTCK {current.sslcertck = FLAG_TRUE;} | SSLCERTPATH STRING {current.sslcertpath = prependdir($2, rcfiledir);} + | SSLCOMMONNAME STRING {current.sslcommonname = xstrdup($2);} | SSLFINGERPRINT STRING {current.sslfingerprint = xstrdup($2);} | NO KEEP {current.keep = FLAG_FALSE;} -- cgit v1.2.3