diff options
| author | ng0 <ng0@n0.is> | 2019-08-15 09:52:39 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-08-15 09:52:39 +0000 |
| commit | 36fb08f81b748620e97d7d8e2d4255b77e78c545 (patch) | |
| tree | 19aa5019c9e9cbf53d74e272fddc8cbc48b39e51 /lib/smtp.c | |
| parent | 765f80c1e27acb585eebef46a97ffc769e452879 (diff) | |
| parent | aa73eb47bc8583070734696b25b34ad54c2c1f5e (diff) | |
| download | gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.tar.gz gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.tar.bz2 gnurl-36fb08f81b748620e97d7d8e2d4255b77e78c545.zip | |
Merge tag 'curl-7_65_3'
7.65.3
Diffstat (limited to 'lib/smtp.c')
| -rw-r--r-- | lib/smtp.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 106bd906f..8ef5a04be 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -359,10 +359,8 @@ static CURLcode smtp_perform_helo(struct connectdata *conn) */ static CURLcode smtp_perform_starttls(struct connectdata *conn) { - CURLcode result = CURLE_OK; - /* Send the STARTTLS command */ - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "STARTTLS"); + CURLcode result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "STARTTLS"); if(!result) state(conn, SMTP_STARTTLS); @@ -378,11 +376,10 @@ static CURLcode smtp_perform_starttls(struct connectdata *conn) */ static CURLcode smtp_perform_upgrade_tls(struct connectdata *conn) { - CURLcode result = CURLE_OK; - struct smtp_conn *smtpc = &conn->proto.smtpc; - /* Start the SSL connection */ - result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone); + struct smtp_conn *smtpc = &conn->proto.smtpc; + CURLcode result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, + &smtpc->ssldone); if(!result) { if(smtpc->state != SMTP_UPGRADETLS) @@ -645,10 +642,8 @@ static CURLcode smtp_perform_rcpt_to(struct connectdata *conn) */ static CURLcode smtp_perform_quit(struct connectdata *conn) { - CURLcode result = CURLE_OK; - /* Send the QUIT command */ - result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "QUIT"); + CURLcode result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "QUIT"); if(!result) state(conn, SMTP_QUIT); |