Commit 13625a0d authored by Jiri Hruska's avatar Jiri Hruska Committed by Steve Holme
Browse files

imap: Removed some FTP heritage leftovers 

Removed user and passwd from the IMAP struct as these cannot be set on
a per-request basis and are leftover from legacy FTP code.
parent 2476b34b

lib/imap.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -523,7 +523,6 @@ static CURLcode imap_state_upgrade_tls(struct connectdata *conn) 
static CURLcode imap_state_login(struct connectdata *conn)

static CURLcode imap_state_login(struct connectdata *conn)

{

{

  CURLcode result = CURLE_OK;

  CURLcode result = CURLE_OK;

  struct IMAP *imap = conn->data->state.proto.imap;

  char *user;

  char *user;

  char *passwd;

  char *passwd;
@@ -536,8 +535,8 @@ static CURLcode imap_state_login(struct connectdata *conn) 
  }

  }





  /* Make sure the username and password are in the correct atom format */

  /* Make sure the username and password are in the correct atom format */

  user = imap_atom(imap->user);

  user = imap_atom(conn->user);

  passwd = imap_atom(imap->passwd);

  passwd = imap_atom(conn->passwd);





  /* Send USER and password */

  /* Send USER and password */

  result = imap_sendf(conn, "LOGIN %s %s", user ? user : "",

  result = imap_sendf(conn, "LOGIN %s %s", user ? user : "",
@@ -1377,13 +1376,6 @@ static CURLcode imap_init(struct connectdata *conn) 
  /* Get some initial data into the imap struct */

  /* Get some initial data into the imap struct */

  imap->bytecountp = &data->req.bytecount;

  imap->bytecountp = &data->req.bytecount;





  /* No need to duplicate user+password, the connectdata struct won't change

     during a session, but we re-init them here since on subsequent inits

     since the conn struct may have changed or been replaced.

  */

  imap->user = conn->user;

  imap->passwd = conn->passwd;



  return CURLE_OK;

  return CURLE_OK;

}

}

lib/imap.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -58,8 +58,6 @@ typedef enum { 
   used. */

   used. */

struct IMAP {

struct IMAP {

  curl_off_t *bytecountp;

  curl_off_t *bytecountp;

  char *user;             /* User name string */

  char *passwd;           /* Password string */

  curl_ftptransfer transfer;

  curl_ftptransfer transfer;

  char *mailbox;          /* Mailbox to select */

  char *mailbox;          /* Mailbox to select */

};

};