From 5f9cc8ceb2f4fd5f10f2439bdf273f465dcd46d1 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Tue, 9 Nov 1999 19:25:39 +0000 Subject: [PATCH] fix for the regression I introduced. when we send the 'MAIL FROM:' command to the SMTP server, we want to send it 'MAIL FROM: ', not 'MAIL FROM: >'. my SMTP server allowed 'MAIL FROM: >' which is why I didn't catch this. --- mailnews/compose/src/nsSmtpProtocol.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mailnews/compose/src/nsSmtpProtocol.cpp b/mailnews/compose/src/nsSmtpProtocol.cpp index 574751de5992..d54a7f65ef43 100644 --- a/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mailnews/compose/src/nsSmtpProtocol.cpp @@ -537,8 +537,7 @@ PRInt32 nsSmtpProtocol::SendHeloResponse(nsIInputStream * inputStream, PRUint32 nsCAutoString buffer; nsresult rv; - // extract the email address and fullname - nsXPIDLCString fullName; + // extract the email address from the identity nsXPIDLCString emailAddress; nsCOMPtr senderIdentity; @@ -549,7 +548,6 @@ PRInt32 nsSmtpProtocol::SendHeloResponse(nsIInputStream * inputStream, PRUint32 } else { senderIdentity->GetEmail(getter_Copies(emailAddress)); - senderIdentity->GetFullName(getter_Copies(fullName)); } /* don't check for a HELO response because it can be bogus and @@ -578,9 +576,13 @@ PRInt32 nsSmtpProtocol::SendHeloResponse(nsIInputStream * inputStream, PRUint32 getter_AddRefs(parser)); char *fullAddress = nsnull; - if (parser) - parser->MakeFullAddress(nsnull, fullName, emailAddress, &fullAddress); - + if (parser) { + // pass nsnull for the name, since we just want the email. + // + // seems a little weird that we are passing in the emailAddress + // when that's the out parameter + parser->MakeFullAddress(nsnull, nsnull /* name */, emailAddress /* address */, &fullAddress); + } #ifdef UNREADY_CODE if (CE_URL_S->msg_pane) {