Commit e25590a2 authored by Steve Holme's avatar Steve Holme Committed by unknown
Browse files

smtp.c: Changed the curl error code for EHLO and HELO responses 

Changed the returned curl error codes for EHLO and HELO responses from
CURLE_LOGIN_DENIED to CURLE_REMOTE_ACCESS_DENIED as a negative response
from these commands represents no service as opposed to a login error.
parent 79afcbef

lib/smtp.c

+6 −4
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static CURLcode smtp_state_ehlo(struct connectdata *conn) 
    return result;



  state(conn, SMTP_EHLO);



  return CURLE_OK;

}
@@ -348,6 +349,7 @@ static CURLcode smtp_state_helo(struct connectdata *conn) 
    return result;



  state(conn, SMTP_HELO);



  return CURLE_OK;

}
@@ -561,8 +563,8 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, 
     !conn->bits.user_passwd)

      result = smtp_state_helo(conn);

    else {

      failf(data, "Access denied: %d", smtpcode);

      result = CURLE_LOGIN_DENIED;

      failf(data, "Remote access denied: %d", smtpcode);

      result = CURLE_REMOTE_ACCESS_DENIED;

    }

  }

  else if(data->set.use_ssl && !conn->ssl[FIRSTSOCKET].use) {
@@ -588,8 +590,8 @@ static CURLcode smtp_state_helo_resp(struct connectdata *conn, 
  (void)instate; /* no use for this yet */



  if(smtpcode/100 != 2) {

    failf(data, "Access denied: %d", smtpcode);

    result = CURLE_LOGIN_DENIED;

    failf(data, "Remote access denied: %d", smtpcode);

    result = CURLE_REMOTE_ACCESS_DENIED;

  }

  else {

    /* end the connect phase */