git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Taint: fix verify. Bug 2598
[users/jgh/exim.git]
/
test
/
confs
/
0092
diff --git
a/test/confs/0092
b/test/confs/0092
index 9c90978117c64acc5cf1f298bfc8e66165ea3d6c..cdcf52330f8e7c6a84ec46f5548e3fde3408f792 100644
(file)
--- a/
test/confs/0092
+++ b/
test/confs/0092
@@
-7,19
+7,18
@@
domainlist local_domains = test.ex : *.test.ex
domainlist relay_domains = test.ex
domainlist relay_domains = test.ex
-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 -----
-smtp_receive_timeout = 2s
+OPT = 2s
+
+.ifndef COM
+smtp_receive_timeout = OPT
receive_timeout = 2s
receive_timeout = 2s
+.endif
begin acl
begin acl