aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-02-23 19:46:21 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-02-23 19:46:21 +0000
commit0b795db731f7a9ef33d45d2be3fb666dd9813d56 (patch)
tree3150afa9c4a028f659e0f62e51a512e3beb28afe
parent8a468ef2225d77e195459e44a14d391a651ed5ae (diff)
smtp: Removed some FTP heritage leftovers
Removed user and passwd from the SMTP struct as these cannot be set on a per-request basis and are leftover from legacy FTP code. Changed some comments still using FTP terminology.
-rw-r--r--lib/smtp.c11
-rw-r--r--lib/smtp.h2
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/smtp.c b/lib/smtp.c
index 8b882afc3..ba219922a 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1291,13 +1291,6 @@ static CURLcode smtp_init(struct connectdata *conn)
/* Get some initial data into the smtp struct */
smtp->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.
- */
- smtp->user = conn->user;
- smtp->passwd = conn->passwd;
-
return CURLE_OK;
}
@@ -1449,8 +1442,8 @@ static CURLcode smtp_done(struct connectdata *conn, CURLcode status,
*
* smtp_perform()
*
- * This is the actual DO function for SMTP. Get a file/directory according to
- * the options previously setup.
+ * This is the actual DO function for SMTP. Send a mail according to the
+ * options previously setup.
*/
static CURLcode smtp_perform(struct connectdata *conn, bool *connected,
bool *dophase_done)
diff --git a/lib/smtp.h b/lib/smtp.h
index ee057af79..bf2f90d8d 100644
--- a/lib/smtp.h
+++ b/lib/smtp.h
@@ -59,8 +59,6 @@ typedef enum {
used. */
struct SMTP {
curl_off_t *bytecountp;
- char *user; /* User name string */
- char *passwd; /* Password string */
curl_pp_transfer transfer;
struct curl_slist *rcpt; /* Recipient list */
};