From: Steve Holme <steve_holme@hotmail.com>
Date: Mon, 31 Mar 2014 21:59:46 +0000 (+0100)
Subject: smtp: Fixed login denied with a RFC-821 based server
X-Git-Tag: curl-7_37_0~205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd9ce1b86cde2a906b38742f92bfccef2b8d18ee;p=thirdparty%2Fcurl.git

smtp: Fixed login denied with a RFC-821 based server

In addition to commit fe260b75e7 fixed the same issue for RFC-821 based
SMTP servers and allow the credientials to be given to curl even though
they are not used with the server.
---

diff --git a/lib/smtp.c b/lib/smtp.c
index cc1f2ad56b..db6a72256a 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -721,8 +721,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, int smtpcode,
   (void)instate; /* no use for this yet */
 
   if(smtpcode/100 != 2 && smtpcode != 1) {
-    if((data->set.use_ssl <= CURLUSESSL_TRY || conn->ssl[FIRSTSOCKET].use) &&
-     !conn->bits.user_passwd)
+    if(data->set.use_ssl <= CURLUSESSL_TRY || conn->ssl[FIRSTSOCKET].use)
       result = smtp_perform_helo(conn);
     else {
       failf(data, "Remote access denied: %d", smtpcode);