generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imap: Removed some FTP heritage leftovers

Browse Source 
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.
This commit is contained in:
Jiri Hruska 2013-02-23 10:41:47 +01:00 committed by Steve Holme
parent 2476b34b95
commit 13625a0d09
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/imap.c
View File

@ -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;
} }

2
lib/imap.h
View File

@ -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 */
}; };