Rename SSL token to SSL_ to resolve clash with OpenSSL's type.

diff --git a/rcfile_l.l b/rcfile_l.l
index 7cbf12ed3c9beaedceb93cd161a85e192204b9f2..bff5b6c018a41a4000208b343a061239831f294f 100644 (file)
--- 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 39bb7a99c217e83adde71af8e09cf1d277df1240..2f028d91610ef65c8d16ae0cc04c6b73cc56987d 100644 (file)
--- 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);}