summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/062027
-rw-r--r--test/mail/0620.b6
-rw-r--r--test/scripts/0000-Basic/06204
3 files changed, 31 insertions, 6 deletions
diff --git a/test/confs/0620 b/test/confs/0620
index 15e31f1c5..7f1b69415 100644
--- a/test/confs/0620
+++ b/test/confs/0620
@@ -13,25 +13,43 @@ acl_not_smtp = not_smtp
begin acl
not_smtp:
- accept log_message = rcpt <$recipients> l <$local_part>
+ accept log_message = rcpts <$recipients> local_part <$local_part>
# ----- Routers -----
begin routers
+hide_verifies:
+ driver = accept
+ verify_only
+
alias:
driver = redirect
debug_print = DEBUG: $r_r1 $r_r2
data = b
- set = <; r_r1 = <$local_part> aaa:bbb bar=baz
+ # r_r1 checks that a variable with tainted data is ok
+ # that the default list-sep ":" is not used for this list
+ # that an '=' on the RHS is ok
+ set = r_r1 = <$local_part> aaa:bbb bar=baz
+ # r_local checks that a variable is immediately usable
set = r_local = check
errors_to = bad_$r_local
user:
driver = accept
debug_print = DEBUG: $r_r1 $r_r2
+ # r_r1 vs. r_r2 checks we can have multiple "set" options
set = r_r1 = $local_part
- set = <; r_r2 = $local_part 2a00:1940:100::ff:0:1 foo=bar
+ set = r_r2 = $local_part \
+ 2a00:1940:100::ff:0:1 \
+ foo=bar \
+ # check we can get a newline into content
+ newline=initial\n\tcont \
+ # check we can get a list-sep into content (by doubling)
+ semicolon=initial;;cont \
+ ; \
+ # r_r3 checks we can have a list as arg for a "set" option
+ r_r3 = bletch
transport = local_delivery
@@ -44,8 +62,7 @@ local_delivery:
envelope_to_add
file = DIR/test-mail/$local_part
user = CALLER
- debug_print = DEBUG: $r_r1 $r_r2
- headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>
+ headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
# End
diff --git a/test/mail/0620.b b/test/mail/0620.b
index 5840bc90a..ef81a0910 100644
--- a/test/mail/0620.b
+++ b/test/mail/0620.b
@@ -4,10 +4,14 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: foo
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 2a00:1940:100::ff:0:1 foo=bar>
+X-r2: <b 2a00:1940:100::ff:0:1 foo=bar newline=initial
+ cont semicolon=initial;cont>
+X-r3: <bletch>
+body
diff --git a/test/scripts/0000-Basic/0620 b/test/scripts/0000-Basic/0620
index 0f662f153..96d598834 100644
--- a/test/scripts/0000-Basic/0620
+++ b/test/scripts/0000-Basic/0620
@@ -1,2 +1,6 @@
# router variables
exim -odi a
+Subject: foo
+
+body
+****