From 846d96e4c0c852e6ee62d733b870fd7944cd68c1 Mon Sep 17 00:00:00 2001 From: superman20 Date: Mon, 3 Mar 2025 14:49:06 -0500 Subject: [PATCH 1/3] Fix greeting message --- connection.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/connection.js b/connection.js index c5fe59996..13a7cca1d 100644 --- a/connection.js +++ b/connection.js @@ -783,10 +783,11 @@ class Connection { }); break; default: { - let greeting = cfg.message.greeting; - if (greeting?.length) { + let greeting; + if (cfg.message.greeting?.length) { // RFC5321 section 4.2 // Hostname/domain should appear after the 220 + greeting = [...cfg.message.greeting]; greeting[0] = `${this.local.host} ESMTP ${greeting[0]}`; if (cfg.uuid.banner_chars) { greeting[0] += ` (${this.uuid.substr(0, cfg.uuid.banner_chars)})`; From 80b28f25cfbaf34c08d788cf5935ecbef43740da Mon Sep 17 00:00:00 2001 From: superman20 Date: Mon, 3 Mar 2025 14:54:17 -0500 Subject: [PATCH 2/3] Update Changes.md --- Changes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes.md b/Changes.md index 18b5c3968..fdc8966db 100644 --- a/Changes.md +++ b/Changes.md @@ -25,6 +25,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). - fix(outbound): in outbound hook_delivered, when mx.exchange contains an IP, use mx.from_dns - fix(bin/haraka): fix for finding path to config/docs/Plugins.md +- fix(connections): fix for infinitely expanding greeting when using a custom greeting + in connections.ini ### [3.0.5] - 2024-09-27 From c77c5a54d2e574a177565fc7c855ecef2b559e59 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Mon, 3 Mar 2025 13:24:58 -0800 Subject: [PATCH 3/3] Update Changes.md more succinct change message with ref to PR --- Changes.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index fdc8966db..f78bb8271 100644 --- a/Changes.md +++ b/Changes.md @@ -25,8 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/). - fix(outbound): in outbound hook_delivered, when mx.exchange contains an IP, use mx.from_dns - fix(bin/haraka): fix for finding path to config/docs/Plugins.md -- fix(connections): fix for infinitely expanding greeting when using a custom greeting - in connections.ini +- fix(connections): fix for infinitely expanding custom greeting #3446 ### [3.0.5] - 2024-09-27