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
Use ALARM() to set deadline on reading the proxy header (Bug 2656)
[users/heiko/exim.git]
/
test
/
confs
/
0297
diff --git
a/test/confs/0297
b/test/confs/0297
index 0e2ca1bd96e3a7df477648b1402aa6d56c1ae5f2..2c98b99c588b50a3833529d28a7a31d3898380b9 100644
(file)
--- a/
test/confs/0297
+++ b/
test/confs/0297
@@
-1,12
+1,8
@@
# Exim test configuration 0297
# Exim test configuration 0297
-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
# ----- Main settings -----
# ----- Main settings -----
@@
-21,7
+17,7
@@
begin routers
r1:
driver = redirect
r1:
driver = redirect
- data = $
local_part
+ data = $
{bless:$local_part}
file_transport = ${if eq {$address_file}{/a/b/c}{tf1}{tf2}}
directory_transport = ${if match{$address_file}{//\$}{td2}{td1}}
user = CALLER
file_transport = ${if eq {$address_file}{/a/b/c}{tf1}{tf2}}
directory_transport = ${if match{$address_file}{//\$}{td2}{td1}}
user = CALLER