diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-05-05 15:49:43 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-05-05 15:49:43 +0200 |
commit | e34131db783336aa17fa0aa664635867459b2a85 (patch) | |
tree | da9d24dbb53329dade737173e340618a509a8759 /lib/smtp.c | |
parent | 335dfa793c239283b0003d3f10739051c10ecb13 (diff) |
SSL: check for SSL, not specific protocols
Code cleanup to check less for protocols and more for the specific
relevant feature. Like if SSL is required.
Diffstat (limited to 'lib/smtp.c')
-rw-r--r-- | lib/smtp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 170c32dbb..e0e4216d3 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1027,12 +1027,10 @@ static CURLcode smtp_multi_statemach(struct connectdata *conn, struct smtp_conn *smtpc = &conn->proto.smtpc; CURLcode result; - if((conn->handler->protocol & CURLPROTO_SMTPS) && !smtpc->ssldone) { + if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone); - } - else { + else result = Curl_pp_multi_statemach(&smtpc->pp); - } *done = (bool)(smtpc->state == SMTP_STOP); |