aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2002-02-01 22:44:25 +0000
committerEric S. Raymond <esr@thyrsus.com>2002-02-01 22:44:25 +0000
commit4f0728eb7de5b48de9a00715d2548fb55a8c911f (patch)
treea29f21e638d30ed693b986c9fdba60a0351f7852
parenta91a23912dec234a9e2c9f6f71c28b6197eb4535 (diff)
downloadfetchmail-4f0728eb7de5b48de9a00715d2548fb55a8c911f.tar.gz
fetchmail-4f0728eb7de5b48de9a00715d2548fb55a8c911f.tar.bz2
fetchmail-4f0728eb7de5b48de9a00715d2548fb55a8c911f.zip
Don't bomb silently on SSL when SSL isn't compiled.
svn path=/trunk/; revision=3574
-rw-r--r--NEWS1
-rw-r--r--rcfile_y.y16
2 files changed, 15 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2520c10c..39b01284 100644
--- 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 7af94c63..15415986 100644
--- 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);}