Re: [PATCH] BUG/MINOR: mailers: negotiate SMTP, not ESMTP

[Willy Tarreau]

On Thu, Feb 17, 2022 at 03:40:51PM +0100, Lukas Tribus wrote:
> As per issue #1552 the mailer code currently breaks on ESMTP multiline
> responses. Let's negotiate SMTP instead.

Merged, thank you Lukas!
Willy

[PATCH] BUG/MINOR: mailers: negotiate SMTP, not ESMTP

[Lukas Tribus]

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

Should be backported to 2.0.
---
 src/mailers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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