Don't bomb silently on SSL when SSL isn't compiled.

svn path=/trunk/; revision=3574

diff --git a/NEWS b/NEWS
index 2520c10c69640640f0a880afc14fb0ade46058bf..39b012843af16178caee3a6ed798652dc566065b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@
 * Fixes for some odd IMAP and SMTP edge cases by Sunil Shetye.
 * UIDL bug fix by Matthias Andree.
 * Use smtpaddress, if present, to set the return path on warning mail.
+* Tell parser to object when SSL keyboard is used with SSL not compiled.
 
 fetchmail-5.9.6 (Fri Dec 14 04:03:50 EST 2001), 21247 lines:
 

diff --git a/rcfile_y.y b/rcfile_y.y
index 7af94c63296f5250eb1d7b5a554a619f0d40c0c8..15415986623108a327e7dd19ae56761cefa064a4 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -338,7 +338,13 @@ user_option        : TO localnames HERE
                | MIMEDECODE            {current.mimedecode  = FLAG_TRUE;}
                | IDLE                  {current.idle        = FLAG_TRUE;}
 
-               | SSL                   {current.use_ssl = FLAG_TRUE;}
+               | SSL                   {
+#ifdef SSL_ENABLE
+                   current.use_ssl = FLAG_TRUE;
+#else
+                   yyerror(GT_("SSL is not enabled"))
+#endif 
+               }
                | SSLKEY STRING         {current.sslkey = xstrdup($2);}
                | SSLCERT STRING        {current.sslcert = xstrdup($2);}
                | SSLPROTO STRING       {current.sslproto = xstrdup($2);}
@@ -358,7 +364,13 @@ user_option        : TO localnames HERE
                | NO MIMEDECODE         {current.mimedecode  = FLAG_FALSE;}
                | NO IDLE               {current.idle        = FLAG_FALSE;}
 
-               | NO SSL                {current.use_ssl = FLAG_FALSE;}
+               | NO SSL                {
+#ifdef SSL_ENABLE
+                   current.use_ssl = FLAG_FALSE;
+#else
+                   yyerror(GT_("SSL is not enabled"))
+#endif 
+               }
 
                | LIMIT NUMBER          {current.limit       = NUM_VALUE_IN($2);}
                | WARNINGS NUMBER       {current.warnings    = NUM_VALUE_IN($2);}