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.6-dev2~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a16e4ebcb6d5848dd867a4ef3edda3760c60124;p=thirdparty%2Fhaproxy.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.
---

diff --git a/src/mailers.c b/src/mailers.c
index 3d01d7532e..34eaa5bb64 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;
 	}