diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2020-05-14 14:13:40 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2020-05-14 14:13:40 -0600 |
| commit | 1e6b822f3fa5bc17ceb94850c15bef643dda393d (patch) | |
| tree | 67729a4fbd11d9734ae9ad911509782e0d4de6fd /imap/src/c-client/nntp.c | |
| parent | 00c4ef9e0d4bc4d1ea210e7a0d31494b4116bb4a (diff) | |
| download | alpine-1e6b822f3fa5bc17ceb94850c15bef643dda393d.tar.xz | |
* Create /starttls as a synonym of /tls. Update the documentation to use
/starttls instead of /tls. This should cause less confusion in Alpine users
in the future.
Diffstat (limited to 'imap/src/c-client/nntp.c')
| -rw-r--r-- | imap/src/c-client/nntp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/imap/src/c-client/nntp.c b/imap/src/c-client/nntp.c index bce7c636..a46a5bd6 100644 --- a/imap/src/c-client/nntp.c +++ b/imap/src/c-client/nntp.c @@ -688,9 +688,9 @@ MAILSTREAM *nntp_mopen (MAILSTREAM *stream) hostlist[0] = strcpy (tmp,mb.host); if (mb.port || nntp_port) sprintf (tmp + strlen (tmp),":%lu",mb.port ? mb.port : nntp_port); - if (mb.tlsflag) strcat (tmp,"/tls"); + if (mb.tlsflag) strcat (tmp,"/starttls"); if (mb.tlssslv23) strcat (tmp,"/tls-sslv23"); - if (mb.notlsflag) strcat (tmp,"/notls"); + if (mb.notlsflag) strcat (tmp,"/nostarttls"); if (mb.sslflag) strcat (tmp,"/ssl"); if (mb.tls1) strcat (tmp,"/tls1"); if (mb.tls1_1) strcat (tmp,"/tls1_1"); @@ -761,9 +761,9 @@ MAILSTREAM *nntp_mopen (MAILSTREAM *stream) sprintf (tmp,"{%s:%lu/nntp",(long) mail_parameters (NIL,GET_TRUSTDNS,NIL) ? net_host (nstream->netstream) : mb.host, net_port (nstream->netstream)); - if (LOCAL->tlsflag) strcat (tmp,"/tls"); + if (LOCAL->tlsflag) strcat (tmp,"/starttls"); if (LOCAL->tlssslv23) strcat (tmp,"/tls-sslv23"); - if (LOCAL->notlsflag) strcat (tmp,"/notls"); + if (LOCAL->notlsflag) strcat (tmp,"/nostarttls"); if (LOCAL->sslflag) strcat (tmp,"/ssl"); if (LOCAL->tls1) strcat (tmp,"/tls1"); if (LOCAL->tls1_1) strcat (tmp,"/tls1_1"); @@ -1752,7 +1752,7 @@ SENDSTREAM *nntp_open_full (NETDRIVER *dv,char **hostlist,char *service, stream = nntp_close (stream); } } - else if (mb.tlsflag) { /* user specified /tls but can't do it */ + else if (mb.tlsflag) { /* user specified /starttls but can't do it */ mm_log ("Unable to negotiate TLS with this server",ERROR); return NIL; } |