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.

diff --git a/lib/smtp.c b/lib/smtp.c
index 8b882afc30d7a82247b3d73e5ec13439f7a7384d..ba219922ade839d2bc1fcbfc9104d6944a65bd18 100644 (file)
--- 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 ee057af79304c292d57684f9bf74bfd101a5d5ed..bf2f90d8d857e6295c43f5bc791d9b3dfda6330f 100644 (file)
--- 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 */
 };