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
Taint: fix ACL "spam" condition, to permit tainted name arguments.
[users/heiko/exim.git]
/
test
/
confs
/
2033
diff --git
a/test/confs/2033
b/test/confs/2033
index 9ed6711721dd5acb77d7e0a5d0c9fce158a6b85a..15e632a57d301bdf2d40b0d52b3ec230bb70eeba 100644
(file)
--- a/
test/confs/2033
+++ b/
test/confs/2033
@@
-3,13
+3,9
@@
SERVER=
SERVER=
-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
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
FX = DIR/aux-fixed
S1 = FX/exim-ca/example.com/server1.example.com
@@
-104,8
+100,9
@@
send_to_server_failcert:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-116,8
+113,9
@@
send_to_server_retry:
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
driver = smtp
allow_localhost
hosts = HOSTIPV4 : 127.0.0.1
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-129,8
+127,9
@@
send_to_server_crypt:
driver = smtp
allow_localhost
hosts = HOSTIPV4
driver = smtp
allow_localhost
hosts = HOSTIPV4
- hosts_require_tls = HOSTIPV4
port = PORT_D
port = PORT_D
+ hosts_try_fastopen = :
+ hosts_require_tls = HOSTIPV4
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-144,6
+143,7
@@
send_to_server_req_fail:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-157,6
+157,7
@@
send_to_server_req_failname:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-171,6
+172,7
@@
send_to_server_req_passname:
allow_localhost
hosts = server1.example.com
port = PORT_D
allow_localhost
hosts = server1.example.com
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-185,6
+187,7
@@
send_to_server_req_failcarryon:
allow_localhost
hosts = HOSTNAME
port = PORT_D
allow_localhost
hosts = HOSTNAME
port = PORT_D
+ hosts_try_fastopen = :
tls_certificate = CERT2
tls_privatekey = CERT2
tls_certificate = CERT2
tls_privatekey = CERT2