summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-01-29 16:34:27 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2021-01-29 18:26:57 +0000
commit0c70e694cf1a703798c0778a3236079e1b25c91d (patch)
treec376d4e1f4cabb268f5b87f4dc75c5040e2c2efb /test
parent37a81ae7317bb78b2ff152821930c2ff0873512b (diff)
Lookups: fix $local_part_data for a match on a filename list element. Bug 2691
Diffstat (limited to 'test')
-rw-r--r--test/aux-fixed/0134.listL1
-rw-r--r--test/confs/013415
-rw-r--r--test/log/01343
-rw-r--r--test/mail/0134.directfile14
-rw-r--r--test/scripts/0000-Basic/01344
5 files changed, 37 insertions, 0 deletions
diff --git a/test/aux-fixed/0134.listL b/test/aux-fixed/0134.listL
new file mode 100644
index 000000000..c3be4e8e1
--- /dev/null
+++ b/test/aux-fixed/0134.listL
@@ -0,0 +1 @@
+direct_file_user
diff --git a/test/confs/0134 b/test/confs/0134
index 9530df652..3376f05f3 100644
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -45,6 +45,14 @@ smartuser:
retry_use_local_part
transport = appendfile
+smartuser_direct:
+ driver = accept
+ domains = test.ex
+ headers_add = "smartuser: dd=$domain_data lpd=$local_part_data"
+ local_parts = DIR/aux-fixed/TESTNUM.listL
+ retry_use_local_part
+ transport = directfile
+
default2:
driver = accept
headers_add = router: defaulted
@@ -71,6 +79,13 @@ appendfile:
${if eq {$local_part}{userx}{lc-userx}{\
$local_part}}}}}}
+directfile:
+ driver = appendfile
+ user = CALLER
+ headers_add = "domain_data: $domain_data\n\
+ local_part_data: $local_part_data"
+ file = DIR/test-mail/directfile
+
pipe:
driver = pipe
command = /bin/sh -c "echo $local_part $domain >DIR/test-mail/$local_part"
diff --git a/test/log/0134 b/test/log/0134
index 1d4707f39..956558fa6 100644
--- a/test/log/0134
+++ b/test/log/0134
@@ -23,3 +23,6 @@
1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbE-0005vi-00 => PIPE <PIPE@PIPE.DOMAIN> R=topipe T=pipe
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbF-0005vi-00 => direct_file_user <direct_file_user@test.ex> R=smartuser_direct T=directfile
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
diff --git a/test/mail/0134.directfile b/test/mail/0134.directfile
new file mode 100644
index 000000000..aa9475d5f
--- /dev/null
+++ b/test/mail/0134.directfile
@@ -0,0 +1,14 @@
+From CALLER@test.ex Tue Mar 02 09:44:33 1999
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+ (envelope-from <CALLER@test.ex>)
+ id 10HmbF-0005vi-00
+ for direct_file_user@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+smartuser: dd=test.ex lpd=direct_file_user
+domain_data: test.ex
+local_part_data: direct_file_user
+
+Test use of filename in local_part list
+
diff --git a/test/scripts/0000-Basic/0134 b/test/scripts/0000-Basic/0134
index 76c1f8206..15f3b05b2 100644
--- a/test/scripts/0000-Basic/0134
+++ b/test/scripts/0000-Basic/0134
@@ -31,3 +31,7 @@ exim -odi PIPE@PIPE.DOMAIN
Test to uppercased piped address.
.
****
+exim -odi direct_file_user@test.ex
+Test use of filename in local_part list
+.
+****