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
Testsuite: Solaris munge
[users/jgh/exim.git]
/
test
/
confs
/
0461
diff --git
a/test/confs/0461
b/test/confs/0461
index 3a890726508e12f7a08bd4332411ca963a1bdd6c..6f476e5002f63d26cf68bd6f0a2e72327c565a47 100644
(file)
--- a/
test/confs/0461
+++ b/
test/confs/0461
@@
-2,15
+2,12
@@
FALLBACK=fallback_hosts = 127.0.0.1
ROUTE_DATA=V4NET.0.0.1
FALLBACK=fallback_hosts = 127.0.0.1
ROUTE_DATA=V4NET.0.0.1
+RETRY1=1s
+RETRY2=2s
+
+.include DIR/aux-var/std_conf_prefix
-exim_path = EXIM_PATH
-host_lookup_order = bydns
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 -----
@@
-40,12
+37,13
@@
begin transports
t1:
driver = smtp
port = PORT_S
t1:
driver = smtp
port = PORT_S
+ hosts_try_fastopen = :
connect_timeout = 1s
allow_localhost
t2:
driver = appendfile
connect_timeout = 1s
allow_localhost
t2:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
user = CALLER
@@
-53,8
+51,8
@@
t2:
begin retry
begin retry
-V4NET.0.0.1 * F,1s,
1s
-V4NET.0.0.2 * F,1s,
2s
+V4NET.0.0.1 * F,1s,
RETRY1
+V4NET.0.0.2 * F,1s,
RETRY2
* * F,1d,1s
* * F,1d,1s