From ad5ca720795a2f55474a22b63f3a26c2470dd3f2 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Fri, 26 Apr 2013 01:56:25 +0200 Subject: [PATCH] Rename SSL token to SSL_ to resolve clash with OpenSSL's type. --- rcfile_l.l | 2 +- rcfile_y.y | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rcfile_l.l b/rcfile_l.l index 7cbf12ed..bff5b6c0 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -175,7 +175,7 @@ mimedec(ode)? { return MIMEDECODE; } idle { return IDLE; } dns { return DNS; } uidl { return UIDL; } -ssl { return SSL; } +ssl { return SSL_; } sslkey { return SSLKEY; } sslcert { return SSLCERT; } sslproto { return SSLPROTO; } diff --git a/rcfile_y.y b/rcfile_y.y index 39bb7a99..2f028d91 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -73,7 +73,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 SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT +%token SSL_ SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT %token PRINCIPAL ESMTPNAME ESMTPPASSWORD %token TRACEPOLLS @@ -338,7 +338,7 @@ user_option : TO mapping_list HERE | MIMEDECODE {current.mimedecode = FLAG_TRUE;} | IDLE {current.idle = FLAG_TRUE;} - | SSL { + | SSL_ { #ifdef SSL_ENABLE current.use_ssl = FLAG_TRUE; #else @@ -367,7 +367,7 @@ user_option : TO mapping_list HERE | NO MIMEDECODE {current.mimedecode = FLAG_FALSE;} | NO IDLE {current.idle = FLAG_FALSE;} - | NO SSL {current.use_ssl = FLAG_FALSE;} + | NO SSL_ {current.use_ssl = FLAG_FALSE;} | LIMIT NUMBER {current.limit = NUM_VALUE_IN($2);} | WARNINGS NUMBER {current.warnings = NUM_VALUE_IN($2);} -- 2.43.2