Commit 8191800a authored by Steve Holme's avatar Steve Holme
Browse files

smtp: Fixed space being sent in non --mail-rcpt based requests 

Commands such as NOOP, RSET and HELP would be sent with a space at the
end of the command, for example: "NOOP ".
parent 2165298f

lib/smtp.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -563,16 +563,16 @@ static CURLcode smtp_perform_command(struct connectdata *conn) 
  struct SessionHandle *data = conn->data;

  struct SessionHandle *data = conn->data;

  struct SMTP *smtp = data->req.protop;

  struct SMTP *smtp = data->req.protop;





  if(smtp->custom && smtp->custom[0] != '\0')

  /* Send the command */

    /* Send the custom command */

  if(smtp->rcpt)

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s %s", smtp->custom,

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s %s",

                           smtp->rcpt ? smtp->rcpt->data : "");

                            smtp->custom && smtp->custom[0] != '\0' ?

  else if(smtp->rcpt)

                            smtp->custom : "VRFY",

    /* Send the VRFY command */

                            smtp->rcpt->data);

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "VRFY %s", smtp->rcpt->data);

  else

  else

    /* Send the HELP command */

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s",

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "%s", "HELP");

                           smtp->custom && smtp->custom[0] != '\0' ?

                           smtp->custom : "HELP");





  if(!result)

  if(!result)

    state(conn, SMTP_COMMAND);

    state(conn, SMTP_COMMAND);