static gint verbose = 1;
static gchar smtp_response[MSGBUFSIZE];
-gint smtp_helo(SockInfo *sock, const char *hostname, gboolean use_smtp_auth)
+gint smtp_helo(SockInfo *sock, const gchar *hostname, gboolean esmtp)
{
- if (use_smtp_auth) {
- sock_printf(sock, "EHLO %s\r\n", hostname);
- if (verbose)
- log_print("ESMTP> EHLO %s\n", hostname);
-
- return esmtp_ok(sock);
- } else {
+ if (esmtp)
+ return esmtp_ehlo(sock, hostname);
+ else {
sock_printf(sock, "HELO %s\r\n", hostname);
if (verbose)
log_print("SMTP> HELO %s\n", hostname);
} else
authtype = SMTPAUTH_CRAM_MD5;
- esmtp_auth(sock, authtype, userid, passwd, use_smtp_auth);
+ if (esmtp_auth(sock, authtype, userid, passwd) != SM_OK)
+ return SM_AUTHFAIL;
}
if (strchr(from, '<'))
log_print("SMTP< %s\n", smtp_response);
if ((smtp_response[0] == '1' || smtp_response[0] == '2' ||
- smtp_response[0] == '3') && smtp_response[3] == ' ')
+ smtp_response[0] == '3') &&
+ (smtp_response[3] == ' ' || smtp_response[3] == '\0'))
return SM_OK;
else if (smtp_response[3] != '-')
return SM_ERROR;