diff options
| -rw-r--r-- | lib/imap.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/imap.c b/lib/imap.c index 0970691d4..8032db4a0 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -709,15 +709,24 @@ static CURLcode imap_state_capability_resp(struct connectdata *conn, { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; + struct imap_conn *imapc = &conn->proto.imapc; (void)instate; /* no use for this yet */ if(imapcode != 'O') result = imap_state_login(conn); else if(data->set.use_ssl && !conn->ssl[FIRSTSOCKET].use) { - /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch - to TLS connection now */ - result = imap_state_starttls(conn); + /* We don't have a SSL/TLS connection yet, but SSL is requested */ + if(imapc->tls_supported) + /* Switch to TLS connection now */ + result = imap_state_starttls(conn); + else if(data->set.use_ssl == CURLUSESSL_TRY) + /* Fallback and carry on with authentication */ + result = imap_authenticate(conn); + else { + failf(data, "STARTTLS not supported."); + result = CURLE_USE_SSL_FAILED; + } } else result = imap_authenticate(conn); |