moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

smtp: Post apop feature code tidy up

Browse Source
This commit is contained in:
Steve Holme 2012-06-09 19:22:29 +01:00
parent a3660127a4
commit 6188855b67
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/smtp.c
View File

@ -1549,11 +1549,13 @@ static CURLcode smtp_disconnect(struct connectdata *conn,
if(!dead_connection && smtpc->pp.conn)
(void)smtp_quit(conn); /* ignore errors on the LOGOUT */
/* Disconnect from the server */
Curl_pp_disconnect(&smtpc->pp);
/* Cleanup the SASL module */
Curl_sasl_cleanup(conn, smtpc->authused);
/* This won't already be freed in some error cases */
/* Cleanup our connection based variables */
Curl_safefree(smtpc->domain);
return CURLE_OK;
@ -1570,8 +1572,6 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected)
/* no data to transfer */
Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
Curl_safefree(smtpc->domain);
return CURLE_OK;
}

2
lib/smtp.h
View File

@ -61,7 +61,7 @@ struct smtp_conn {
size_t eob; /* Number of bytes of the EOB (End Of Body) that
have been received so far */
unsigned int authmechs; /* Accepted authentication mechanisms */
unsigned int authused; /* Authentication method used for the connection */
unsigned int authused; /* Auth mechanism used for the connection */
smtpstate state; /* Always use smtp.c:state() to change state! */
struct curl_slist *rcpt; /* Recipient list */
bool ssldone; /* Is connect() over SSL done? only relevant in