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
Use %ld not %l
[exim.git]
/
test
/
confs
/
9001
diff --git
a/test/confs/9001
b/test/confs/9001
index 6817dbeb5d282ea507915e47e9d8432f8d91aba6..58c8b4036a03603283ebcc3e8ec469ebba4225fb 100644
(file)
--- a/
test/confs/9001
+++ b/
test/confs/9001
@@
-1,13
+1,8
@@
# Exim test configuration 9001
# Exim test configuration 9001
-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
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----
@@
-23,7
+18,7
@@
r0:
r1:
driver = redirect
r1:
driver = redirect
- data = ${lookup ldap
user="cn=xxx,o=yyy,c=UK" pass
="secret" \
+ data = ${lookup ldap
{USER="cn=xxx,o=yyy,c=UK" PASS
="secret" \
ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}
ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}
@@
-34,6
+29,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
user = CALLER