diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2019-08-20 20:35:59 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2019-08-20 20:35:59 -0600 |
| commit | c5698766d4c4f64c44ca4ab8341967389393d35d (patch) | |
| tree | 94185f6dee75618924bc7dc36fde261a61fe3dc1 | |
| parent | 635592f1adc92365b297258138640ed146a9122f (diff) | |
| download | alpine-c5698766d4c4f64c44ca4ab8341967389393d35d.tar.xz | |
* Improve code that determines the type of encryption that is used according
to user's request.
| -rw-r--r-- | imap/src/c-client/mail.c | 8 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/imap/src/c-client/mail.c b/imap/src/c-client/mail.c index 49444ebe..7291a642 100644 --- a/imap/src/c-client/mail.c +++ b/imap/src/c-client/mail.c @@ -6240,10 +6240,10 @@ NETSTREAM *net_open (NETMBX *mb,NETDRIVER *dv,unsigned long port, NETSTREAM *stream = NIL; char tmp[MAILTMPLEN]; unsigned long flags = mb->novalidate ? NET_NOVALIDATECERT : 0; - flags |= mb->tls1 || mb->tlsflag ? NET_TRYTLS1 : 0; - flags |= mb->tls1_1 ? NET_TRYTLS1_1 : 0; - flags |= mb->tls1_2 ? NET_TRYTLS1_2 : 0; - flags |= mb->tls1_3 ? NET_TRYTLS1_3 : 0; + flags |= mb->tls1 ? NET_TRYTLS1 + : mb->tls1_1 ? NET_TRYTLS1_1 + : mb->tls1_2 ? NET_TRYTLS1_2 + : mb->tls1_3 ? NET_TRYTLS1_3 : 0; if (strlen (mb->host) >= NETMAXHOST) { sprintf (tmp,"Invalid host name: %.80s",mb->host); MM_LOG (tmp,ERROR); diff --git a/pith/pine.hlp b/pith/pine.hlp index 50dcf010..d3e390d8 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 363 2019-08-09 16:00:40 +Alpine Commit 364 2019-08-20 20:35:47 ============= h_news ================= <HTML> <HEAD> |