Fix rfs port for verp_smtp, allow reserve SMTP from +trust_hosts

diff --git a/master b/master
index b7d35f15e02daed0699c02c18d4897e5b6ed4c63..163faea539939af8a67bc28031536faba1a0aa7e 100644 (file)
--- 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