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: avoid using STARTTLS in a non-TLS testcase
[users/heiko/exim.git]
/
test
/
confs
/
0571
diff --git
a/test/confs/0571
b/test/confs/0571
index 79b816ac7d69f3c65a578b52e6201ddb22f44bed..a818257f57e530781ea13e32f55f29b8cec24c76 100644
(file)
--- a/
test/confs/0571
+++ b/
test/confs/0571
@@
-2,15
+2,9
@@
LOG_SELECTOR=
LOG_SELECTOR=
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-33,8
+27,8
@@
acl_not_smtp = ${if def:sender_address \
begin acl
acl_29_29_29:
begin acl
acl_29_29_29:
- deny dnslists = test.ex/$sender_address_domain
- accept
+ deny dnslists =
test.ex/$sender_address_domain
+ accept
logwrite = authresults: ${authresults {$primary_hostname}}
acl_29_29_0:
deny dnslists = test.ex
acl_29_29_0:
deny dnslists = test.ex