git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: unbreak use of explicit stderr on BSDs
[exim.git]
/
test
/
confs
/
0567
diff --git
a/test/confs/0567
b/test/confs/0567
index 7348b1fe507ceff30da1b1fd80d1c40b58c3afd0..b85f3b5fe0f00a51cf3eca0fbcef16adfb2a0da4 100644
(file)
--- a/
test/confs/0567
+++ b/
test/confs/0567
@@
-1,15
+1,10
@@
-# Exim test configuration 05
32
+# Exim test configuration 05
67
CONNECTCOND=
CONNECTCOND=
-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 -----
@@
-63,6
+58,7
@@
data:
remove_header = x-data-2
warn log_message = Verified removed header X-Data-3 in this ACL still visible
condition = ${if !eq{$h_x-data-3:}{}}
remove_header = x-data-2
warn log_message = Verified removed header X-Data-3 in this ACL still visible
condition = ${if !eq{$h_x-data-3:}{}}
+ warn remove_header = \N^(?i)Authentication-Results\s*::\s*remove.org;\N
accept
notsmtp:
accept
notsmtp:
@@
-86,6
+82,7
@@
begin transports
t1:
driver = appendfile
file = DIR/test-mail/$local_part
t1:
driver = appendfile
file = DIR/test-mail/$local_part
+ create_file = DIR/test-mail
user = CALLER
# End
user = CALLER
# End