From b4f579d134197249b448cb5d8abf801ba4c729bb Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 11 Jul 2019 17:12:26 +0100
Subject: Keep router-variables separate on addrs, to avoid taint contamination

---
 test/confs/0620  | 10 ++++++++--
 test/mail/0620.b |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/confs/0620 b/test/confs/0620
index b1f48c40e..61f577417 100644
--- a/test/confs/0620
+++ b/test/confs/0620
@@ -8,6 +8,12 @@
 domainlist local_domains = test.ex
 qualify_domain = test.ex
 
+acl_not_smtp = not_smtp
+
+begin acl
+
+not_smtp:
+  accept log_message = rcpt <$recipients> l <$local_part>
 
 # ----- Routers -----
 
@@ -17,13 +23,13 @@ alias:
   driver =	redirect
   debug_print = DEBUG: $r_r1 $r_r2
   data =	b
-  set =		r_r1 = $local_part
+  set =	<;	r_r1 = $local_part aaa:bbb bar=baz
 
 user:
   driver =	accept
   debug_print = DEBUG: $r_r1 $r_r2
   set =		r_r1 = $local_part
-  set =		r_r2 = $local_part
+  set =	<;	r_r2 = $local_part 2a00:1940:100::ff:0:1 foo=bar
   transport =	local_delivery
 
 
diff --git a/test/mail/0620.b b/test/mail/0620.b
index 11db13d23..a30deb558 100644
--- a/test/mail/0620.b
+++ b/test/mail/0620.b
@@ -8,6 +8,6 @@ Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-r1:  b
-X-r2:  b
+X-r2:  b 2a00:1940:100::ff:0:1 foo=bar
 
 
-- 
cgit v1.2.3