aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-03-31 22:59:46 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-04-01 07:20:19 +0100
commitdd9ce1b86cde2a906b38742f92bfccef2b8d18ee (patch)
tree60ab35ddaaa57b3f804ac9cdf6245ce773ab1c0a
parentb201d9adb8a179ce059bb2a4851dc7ddc4330032 (diff)
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.
-rw-r--r--lib/smtp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/smtp.c b/lib/smtp.c
index cc1f2ad56..db6a72256 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);