regression with lmtp_hdr_delivery_address in 2.3

Hi,

In my LMTP config, I have

lmtp_hdr_delivery_address = none.

Under 2.2, Received headers looked like this:

Received: from smtp.example.com by lmtp.example.com with LMTP id +IVdKS81cFwWagAAGhmRSA ; Fri, 22 Feb 2019 17:45:19 +0000

After the update to 2.3, they look like this:

Received: from smtp.example.com by lmtp.example.com with LMTP id MJbKAMFEclyKCQAAGhmRSA (envelope-from <yyy@example.net>) for <xxx@example.com>; Sun, 24 Feb 2019 07:16:17 +0000

In both cases I *do not* have a "Delivered-To" header

I do see a check for rcpt_to == NULL in the smtp_server_transaction_write_trace_record function, but it looks like the lmtp_local_add_headers function does not update the transaction, so it doesn't get pulled in. Also, the LMTP settings struct isn't exposed in that function currently, and I'm not sure how to add it.

In 2.2, both the "Delivered-To" and "Received" headers were handled by client_get_added_headers.

Please CC me in replies, as I am not subscribed to the list.

Thanks, Ryan