diff options
| -rw-r--r-- | lib/smtp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 05c0a780a..36ad58687 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -490,10 +490,8 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn, else result = smtp_authenticate(conn); } - else { - state(conn, SMTP_UPGRADETLS); + else result = smtp_state_upgrade_tls(conn); - } return result; } @@ -505,9 +503,14 @@ static CURLcode smtp_state_upgrade_tls(struct connectdata *conn) result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone); - if(smtpc->ssldone) { - smtp_to_smtps(conn); - result = smtp_state_ehlo(conn); + if(!result) { + if(smtpc->state != SMTP_UPGRADETLS) + state(conn, SMTP_UPGRADETLS); + + if(smtpc->ssldone) { + smtp_to_smtps(conn); + result = smtp_state_ehlo(conn); + } } return result; |