From ccc42cd1a2d448681872f33e1493b72163fced7a Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 7 Aug 2023 09:57:22 -0700
Subject: [PATCH] Fix rfs port for verp_smtp, allow reserve SMTP from
 +trust_hosts

---
 master | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/master b/master
index b7d35f1..163faea 100644
--- a/master
+++ b/master
@@ -25,7 +25,7 @@ add_environment = PATH=/usr/bin::/bin
 # Allow 20 incoming connections, 20 more for MSA
 smtp_accept_max = 40
 smtp_accept_reserve = 20
-smtp_reserve_hosts = ${if eq {$interface_port}{587} {*}}
+smtp_reserve_hosts = ${if eq {$interface_port}{587} {*}{+trust_hosts}}
 
 # Let anyone run 'exim -bp'.
 queue_list_requires_admin = false
@@ -439,6 +439,7 @@ remote_smtp:
 
 verp_smtp:
   driver = smtp
+  port = ${if eq{$domain}{rfs.dyndns.infradead.org}{587}{25}}
   return_path = ${local_part:$return_path}+$original_local_part=$original_domain@${domain:$return_path}
   max_rcpt = 1
   headers_remove = Errors-To
-- 
2.49.0