summaryrefslogtreecommitdiff
path: root/pith/conf.c
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2013-10-06 23:58:51 -0600
committerEduardo Chappa <chappa@washington.edu>2013-10-06 23:58:51 -0600
commit30a979ab1460a57d466a6a5cc6adb96eac452ce4 (patch)
tree1aec0ebb21be40922bc5a708c7780fb0db602202 /pith/conf.c
parentc5bb25b1320af6cda4cc62ea9e15fbb03ee92026 (diff)
downloadalpine-30a979ab1460a57d466a6a5cc6adb96eac452ce4.tar.xz
* new version 2.11.8
* Fix in configure script for recognition of SSL files in Ubuntu 12.04 * Alpine does not attempt to automatically reopen a collection that was not opened due to cancellation by the user. Instead, the user must try to open it explicitly. * few improvements on new /tls1, /tls1_1, etc. options.
Diffstat (limited to 'pith/conf.c')
-rw-r--r--pith/conf.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/pith/conf.c b/pith/conf.c
index 10c64cfa..7cd1f83d 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -8041,14 +8041,14 @@ get_supported_options(void)
/*
* Line count:
* Title + blank = 2
- * SSL Title + SSL lines + blank = 4
+ * SSL Title + SSL lines + blank = 5
* Auth title + blank = 2
* Driver title + blank = 2
* LDAP title + LDAP line = 2
* Disabled explanation + blank line = 4
* end = 1
*/
- cnt = 17;
+ cnt = 18;
for(a = mail_lookup_auth(1); a; a = a->next)
cnt++;
for(d = (DRIVER *)mail_parameters(NIL, GET_DRIVERS, NIL);
@@ -8078,6 +8078,10 @@ get_supported_options(void)
config[cnt] = cpystr(_(" TLS and SSL"));
else
config[cnt] = cpystr(_(" None (no TLS or SSL)"));
+#ifdef SSL_SUPPORTS_TLSV1_2
+ if(++cnt < alcnt)
+ config[cnt] = cpystr(" TLSv1.1, TLSv1.2, and DTLSv1");
+#endif
#ifdef SMIME
if(++cnt < alcnt)
config[cnt] = cpystr(" S/MIME");