summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-04-25 17:24:31 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2021-04-25 21:45:02 +0100
commitb3ce3e5440ea0ce5e3580aa9a0fa18c88214a286 (patch)
tree47d4585a8d181a67109423f8a0e08467341b3689 /test/confs
parent82fecf8fd8f749abfc538a06d9eefc7119e014ae (diff)
Testsuite: tidying
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/00272
-rw-r--r--test/confs/00842
-rw-r--r--test/confs/01074
-rw-r--r--test/confs/01312
-rw-r--r--test/confs/01539
-rw-r--r--test/confs/02122
-rw-r--r--test/confs/022614
-rw-r--r--test/confs/023714
-rw-r--r--test/confs/02432
-rw-r--r--test/confs/02515
-rw-r--r--test/confs/02666
-rw-r--r--test/confs/02706
-rw-r--r--test/confs/02972
-rw-r--r--test/confs/03069
-rw-r--r--test/confs/030710
-rw-r--r--test/confs/03804
-rw-r--r--test/confs/04522
-rw-r--r--test/confs/05062
-rw-r--r--test/confs/05334
-rw-r--r--test/confs/05762
-rw-r--r--test/confs/50016
21 files changed, 60 insertions, 49 deletions
diff --git a/test/confs/0027 b/test/confs/0027
index 53e9357c0..6c5120d8e 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -39,7 +39,7 @@ data3:
acl_rcpt:
warn set acl_m_1 = ${acl {data}}
accept endpass
- acl = ${bless:${tr{$local_part}{:}{\n}}}
+ acl = ${tr{$local_part}{:}{\n}}
deny message = this message should not occur
diff --git a/test/confs/0084 b/test/confs/0084
index bbee05f04..88f43213c 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -20,7 +20,7 @@ smart:
forward:
driver = redirect
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed}}
redirect_router = localuser
require_files = DIR/aux-fixed/TESTNUM.$local_part
retry_use_local_part
diff --git a/test/confs/0107 b/test/confs/0107
index f904150f1..190fa9776 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -26,9 +26,9 @@ begin transports
appendfile:
driver = appendfile
create_file = belowhome
- file = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
+ file = ${lookup {$local_part} lsearch {DIR/aux-fixed/TESTNUM.filelist}\
{${if match{$value}{^/}{}{DIR/}}$value}\
- {DIR/test-mail/${bless:$local_part}}}
+ {DIR/test-mail/$local_part}}
user = CALLER
# ----- Retry -----
diff --git a/test/confs/0131 b/test/confs/0131
index 087bd5540..552060cde 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -25,7 +25,7 @@ forward:
driver = redirect
allow_filter
no_check_local_user
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
retry_use_local_part
user = CALLER
address_data = $address_data-forward
diff --git a/test/confs/0153 b/test/confs/0153
index 35a004a45..60a9cb9a5 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,17 +13,14 @@ begin routers
virtual:
driver = redirect
domains = *.virt.test.ex
- address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}}
- data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
- {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
- fail}
+ data = ${lookup {$local_part} lsearch \
+ {${lookup {TESTNUM.alias.$1} dsearch,ret=full {DIR/aux-fixed} {$value}fail}}}
no_more
list:
driver = redirect
domains = list.test.ex
- file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
- {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
+ file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
no_more
real:
diff --git a/test/confs/0212 b/test/confs/0212
index 7cbc8c84a..223bd574f 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -58,7 +58,7 @@ alias:
forward:
driver = redirect
no_check_local_user
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}.forward
+ file = ${lookup {TESTNUM.$local_part.forward} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
retry_use_local_part
all:
diff --git a/test/confs/0226 b/test/confs/0226
index 379545bf8..e83120839 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -22,10 +22,14 @@ bounces:
notallowed:
driver = redirect
+ domains = no.test.ex
allow_defer
caseful_local_part
- data = $local_part
- domains = no.test.ex
+ data = ${extract {$local_part} \
+ { file1=/a/b/c \
+ pipe1=|/p/q/r \
+ file2=DIR/test-mail/file \
+ pipe2=|DIR/aux-fixed/showenv }}
forbid_file
forbid_pipe
retry_use_local_part
@@ -34,7 +38,11 @@ allowed:
driver = redirect
allow_defer
caseful_local_part
- data = ${bless:$local_part}
+ data = ${extract {$local_part} \
+ { file1=/a/b/c \
+ pipe1=|/p/q/r \
+ file2=DIR/test-mail/file \
+ pipe2=|DIR/aux-fixed/showenv }}
file_transport = address_file
pipe_transport = address_pipe
retry_use_local_part
diff --git a/test/confs/0237 b/test/confs/0237
index 0eb8f2603..31d6c4bcd 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -22,10 +22,14 @@ bounces:
notallowed:
driver = redirect
+ domains = no.test.ex
allow_defer
caseful_local_part
- data = $local_part
- domains = no.test.ex
+ data = ${extract {$local_part} \
+ { file1=/a/b/c \
+ pipe1=|/p/q/r \
+ file2=DIR/test-mail/file \
+ pipe2=|DIR/aux-fixed/showenv}}
forbid_file
forbid_pipe
hide_child_in_errmsg
@@ -35,7 +39,11 @@ allowed:
driver = redirect
allow_defer
caseful_local_part
- data = ${bless:$local_part}
+ data = ${extract {$local_part} \
+ { file1=/a/b/c \
+ pipe1=|/p/q/r \
+ file2=DIR/test-mail/file \
+ pipe2=|DIR/aux-fixed/showenv}}
file_transport = address_file
hide_child_in_errmsg
pipe_transport = address_pipe
diff --git a/test/confs/0243 b/test/confs/0243
index 438acc2fb..339312863 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -72,7 +72,7 @@ address_pipe:
stuur_auto_antwoord:
driver = autoreply
- file = DIR/aux-fixed/TESTNUM.antwoord-${bless:$local_part}
+ file = ${lookup {TESTNUM.antwoord-$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
file_expand
from = "${lookup{$local_part} lsearch \
{DIR/aux-fixed/TESTNUM.beantwoorders} {$value}}"
diff --git a/test/confs/0251 b/test/confs/0251
index 9c951528c..ebad92684 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -32,14 +32,13 @@ exeter_listr:
no_check_local_user
domains = listr.test.ex
errors_to = ${local_part}-request@test.ex
- file = DIR/aux-fixed/TESTNUM.list.${bless:$local_part}
+ file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
forbid_file
forbid_pipe
one_time
require_files = DIR/aux-fixed/TESTNUM.restrict.${local_part}
retry_use_local_part
- senders = ${if exists{DIR/aux-fixed/TESTNUM.restrict.${local_part}} \
- {${bless:DIR/aux-fixed/TESTNUM.restrict.${local_part}}}{zzzz}}
+ senders = ${lookup {TESTNUM.restrict.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value} {zzzz}}
syntax_errors_to = ${local_part}-request@test.ex
exeter_listf:
diff --git a/test/confs/0266 b/test/confs/0266
index 6558a5ef2..2f6cece91 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -30,14 +30,14 @@ r1:
skip_syntax_errors
local_parts = ^list
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
r1a:
driver = redirect
skip_syntax_errors
local_parts = ^nmlist
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
no_more
r2:
@@ -47,7 +47,7 @@ r2:
syntax_errors_to = postmaster@test.ex
syntax_errors_text = "There's an error in your filter file.\n\
The file has been ignored."
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
allow_filter
router_home_directory = DIR
user = CALLER
diff --git a/test/confs/0270 b/test/confs/0270
index 8b3441cd0..7dae6d523 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -30,14 +30,14 @@ r1:
skip_syntax_errors
local_parts = ^list
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
r1a:
driver = redirect
skip_syntax_errors
local_parts = ^nmlist
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
no_more
r2:
@@ -47,7 +47,7 @@ r2:
syntax_errors_to = postmaster@test.ex
syntax_errors_text = "There's an error in your filter file.\n\
The file has been ignored."
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
allow_filter
router_home_directory = DIR/
user = CALLER
diff --git a/test/confs/0297 b/test/confs/0297
index 2c98b99c5..b07fc54cb 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -17,7 +17,7 @@ begin routers
r1:
driver = redirect
- data = ${bless:$local_part}
+ data = $local_part
file_transport = ${if eq {$address_file}{/a/b/c}{tf1}{tf2}}
directory_transport = ${if match{$address_file}{//\$}{td2}{td1}}
user = CALLER
diff --git a/test/confs/0306 b/test/confs/0306
index c346012df..ec18055ad 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -27,14 +27,15 @@ r1:
driver = redirect
domains = lists.test.ex
local_part_suffix = -request
- file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}
+ file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
r2:
driver = redirect
domains = lists.test.ex
- senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
- {lsearch;${bless:DIR/aux-fixed/TESTNUM/$local_part}}{*}}
- file = DIR/aux-fixed/TESTNUM/${bless:$local_part}
+ senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part} \
+ {lsearch;${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM}}} \
+ {*}}
+ file = ${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
forbid_pipe
forbid_file
one_time
diff --git a/test/confs/0307 b/test/confs/0307
index 9e78a0c15..e07ef794f 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -19,12 +19,10 @@ r1:
domains = lists.test.ex
local_part_suffix = -request
local_part_suffix_optional
- senders = ${if eq {$local_part_suffix}{-request}{*}\
- {\
- ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
- {lsearch;${bless:DIR/aux-fixed/TESTNUM/$local_part}}{*}}\
- }}
- file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}
+ senders = ${if eq {$local_part_suffix}{-request} \
+ {*} \
+ {${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}{*}}} }
+ file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
forbid_pipe
forbid_file
one_time
diff --git a/test/confs/0380 b/test/confs/0380
index 42eb64ed3..0b7b1874a 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -25,13 +25,13 @@ r0:
r1:
driver = redirect
local_parts = aaaa
- file = DIR/non-exist/${bless:$local_part}
+ file = DIR/non-exist/aaaa
r2:
driver = redirect
local_parts = bbbb
ignore_enotdir
- file = DIR/non-exist/${bless:$local_part}
+ file = DIR/non-exist/bbbb
r3:
driver = accept
diff --git a/test/confs/0452 b/test/confs/0452
index 8d04b4242..8ac3b923f 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -17,7 +17,7 @@ begin routers
r1:
driver = redirect
allow_filter
- file = DIR/aux-fixed/TESTNUM.${bless:filter-$h_fno:}
+ file = DIR/aux-fixed/TESTNUM.filter-FILTER
reply_transport = t2
user = CALLER
diff --git a/test/confs/0506 b/test/confs/0506
index 35cdef19a..29c6a17d1 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -20,7 +20,7 @@ r1:
user = EXIMUSER
ALLOW
FORBID
- file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+ file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
# ----- Retry -----
diff --git a/test/confs/0533 b/test/confs/0533
index 82699fe05..36e547ad6 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -16,7 +16,7 @@ r1:
driver = redirect
local_part_prefix = file-
local_part_suffix = =*
- data = DIR/test-mail/${substr_1:$local_part_suffix}
+ data = DIR/test-mail/${extract {${substr_1:$local_part_suffix}} {mbox=mbox mbox2=mbox2}}
file_transport = t1
r2:
@@ -24,7 +24,7 @@ r2:
local_part_prefix = pipe-
local_part_suffix = =*
caseful_local_part = true
- data = |${bless:${substr_1:$local_part_suffix}}
+ data = |DIR/bin/${extract {$local_part} {userx=iefbr14 usery=iefbr14 userz=../bin/iefbr14}}
pipe_transport = t2
diff --git a/test/confs/0576 b/test/confs/0576
index 5b023d280..d6c0a1dc5 100644
--- a/test/confs/0576
+++ b/test/confs/0576
@@ -16,7 +16,7 @@ begin acl
rcpt:
accept
- queue = ${if eq {normal}{$local_part} {} {${bless:$local_part}}}
+ queue = ${extract {$local_part} {normal="" alternate=alternate lowpri=lowpri}}
logwrite = using queue '$queue_name'
#---------------
diff --git a/test/confs/5001 b/test/confs/5001
index 7bf79ae38..68b9d12c7 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -27,9 +27,9 @@ maildir:
driver = appendfile
maildir_format
create_file = belowhome
- directory = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
- {${if match{$value}{^/}{}{DIR/}}$value}\
- {DIR/test-mail/${bless:$local_part}}}
+ directory = ${lookup {$local_part} lsearch {DIR/aux-fixed/TESTNUM.filelist}\
+ {${if match{$value}{^/}{}{DIR/}}$value}\
+ {DIR/test-mail/$local_part}}
user = CALLER
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 13:39:57 +0000