From 1791a61a1b0879978ec0cbd5d6fca538bd7256da Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Sun, 19 May 2024 18:29:19 -0700 Subject: [PATCH] o/hmail: fix transaction notes setting bind_helo (#3363) --- outbound/hmail.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/outbound/hmail.js b/outbound/hmail.js index 6afe368d2..b9c02d80f 100644 --- a/outbound/hmail.js +++ b/outbound/hmail.js @@ -287,19 +287,14 @@ class HMailItem extends events.EventEmitter { this.force_tls = this.get_force_tls(mx) - // Allow transaction notes to set outbound IP - if (!mx.bind && this.todo.notes.outbound_ip) { - mx.bind = this.todo.notes.outbound_ip; + if (this.todo.notes.outbound_ip) { + this.logerror(`notes.outbound_ip is deprecated. Use get_mx.bind instead!`); + if (!mx.bind) mx.bind = this.todo.notes.outbound_ip; } // Allow transaction notes to set outbound IP helo - if (!mx.bind_helo){ - if (this.todo.notes.outbound_helo) { - mx.bind_helo = this.todo.notes.outbound_helo; - } - else { - mx.bind_helo = net_utils.get_primary_host_name(); - } + if (this.todo.notes.outbound_helo) { + mx.bind_helo = this.todo.notes.outbound_helo; } const host = mx.path ? mx.path : mx.exchange;