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
Testsuite: TLS client testcase consolidation
[users/heiko/exim.git]
/
test
/
confs
/
2004
diff --git
a/test/confs/2004
b/test/confs/2004
index 280de5304b30d676059cb797b4fdefbaf6b023d4..f40e8ba83d7ea30ae78e2f3be8a72b0cbf308de6 100644
(file)
--- a/
test/confs/2004
+++ b/
test/confs/2004
@@
-1,13
+1,8
@@
# Exim test configuration 2004
# Exim test configuration 2004
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_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 -----
@@
-49,7
+44,7
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER
headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
user = CALLER