From: Lukas Tribus <lukas@ltri.eu>
Date: Thu, 17 Feb 2022 14:40:51 +0000 (+0100)
Subject: BUG/MINOR: mailers: negotiate SMTP, not ESMTP
X-Git-Tag: v2.5.3~8
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=667c78079f0a6e33a670495c8f0728400c98700c;p=haproxy-2.5.git

BUG/MINOR: mailers: negotiate SMTP, not ESMTP

As per issue #1552 the mailer code currently breaks on ESMTP multiline
responses. Let's negotiate SMTP instead.

Should be backported to 2.0.

(cherry picked from commit 1a16e4ebcb6d5848dd867a4ef3edda3760c60124)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>
---

diff --git a/src/mailers.c b/src/mailers.c
index 3d01d75..34eaa5b 100644
--- a/src/mailers.c
+++ b/src/mailers.c
@@ -195,7 +195,7 @@ static int enqueue_one_email_alert(struct proxy *p, struct server *s,
 		goto error;
 
 	{
-		const char * const strs[4] = { "EHLO ", p->email_alert.myhostname, "\r\n" };
+		const char * const strs[4] = { "HELO ", p->email_alert.myhostname, "\r\n" };
 		if (!add_tcpcheck_send_strs(&alert->rules, strs))
 			goto error;
 	}