aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Hruska <jirka@fud.cz>2013-02-23 10:41:47 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-02-23 11:27:04 +0000
commit13625a0d09a0ad61960d2bd9eeb1fec3c05461d6 (patch)
tree7f665da54159934a0a402faa2abd9fbe80bde28e
parent2476b34b95596ec16aab09c85133bc7eddd8ca53 (diff)
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.
-rw-r--r--lib/imap.c12
-rw-r--r--lib/imap.h2
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/imap.c b/lib/imap.c
index cff4d8133..b6f5b97df 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -523,7 +523,6 @@ static CURLcode imap_state_upgrade_tls(struct connectdata *conn)
static CURLcode imap_state_login(struct connectdata *conn)
{
CURLcode result = CURLE_OK;
- struct IMAP *imap = conn->data->state.proto.imap;
char *user;
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 */
- user = imap_atom(imap->user);
- passwd = imap_atom(imap->passwd);
+ user = imap_atom(conn->user);
+ passwd = imap_atom(conn->passwd);
/* Send USER and password */
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 */
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;
}
diff --git a/lib/imap.h b/lib/imap.h
index acec210b0..7ab1af7b3 100644
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -58,8 +58,6 @@ typedef enum {
used. */
struct IMAP {
curl_off_t *bytecountp;
- char *user; /* User name string */
- char *passwd; /* Password string */
curl_ftptransfer transfer;
char *mailbox; /* Mailbox to select */
};