Commit 6188855b authored by Steve Holme's avatar Steve Holme
Browse files

smtp: Post apop feature code tidy up

parent a3660127

lib/smtp.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

lib/smtp.h

+1 −1
Original line number Diff line number Diff line
@@ -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