git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gsasl authenticator: support client salted-password caching
[users/heiko/exim.git]
/
test
/
confs
/
0266
diff --git
a/test/confs/0266
b/test/confs/0266
index 534abaea8aad5f56bb9869408393aa3ce1ce35da..42ea1b1f6b2e190b7b38c56743b49aecdbbf66e4 100644
(file)
--- a/
test/confs/0266
+++ b/
test/confs/0266
@@
-1,13
+1,8
@@
# Exim test configuration 0266
# Exim test configuration 0266
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-20,7
+15,7
@@
begin transports
t1:
driver = appendfile
t1:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
envelope_to_add
return_path_add
user = CALLER
envelope_to_add
return_path_add
@@
-34,14
+29,14
@@
r1:
skip_syntax_errors
local_parts = ^list
syntax_errors_to = postmaster@test.ex
skip_syntax_errors
local_parts = ^list
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.$
local_part
+ file = DIR/aux-fixed/TESTNUM.$
{bless:$local_part}
r1a:
driver = redirect
skip_syntax_errors
local_parts = ^nmlist
syntax_errors_to = postmaster@test.ex
r1a:
driver = redirect
skip_syntax_errors
local_parts = ^nmlist
syntax_errors_to = postmaster@test.ex
- file = DIR/aux-fixed/TESTNUM.$
local_part
+ file = DIR/aux-fixed/TESTNUM.$
{bless:$local_part}
no_more
r2:
no_more
r2:
@@
-51,7
+46,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."
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.$
local_part
+ file = DIR/aux-fixed/TESTNUM.$
{bless:$local_part}
allow_filter
router_home_directory = DIR
user = CALLER
allow_filter
router_home_directory = DIR
user = CALLER