From 13625a0d09a0ad61960d2bd9eeb1fec3c05461d6 Mon Sep 17 00:00:00 2001 From: Jiri Hruska Date: Sat, 23 Feb 2013 10:41:47 +0100 Subject: 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. --- lib/imap.c | 12 ++---------- lib/imap.h | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'lib') 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 */ }; -- cgit v1.2.3