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: fix testcase for SPF empty-mailfrom-use-helo. Bug 467
[users/heiko/exim.git]
/
test
/
confs
/
0139
diff --git
a/test/confs/0139
b/test/confs/0139
index 5327de987a3356dc352aace506875863bd60d668..5aaa611830875106c5084cb251278b71f226a955 100644
(file)
--- a/
test/confs/0139
+++ b/
test/confs/0139
@@
-1,12
+1,7
@@
# Exim test configuration 0139
# Exim test configuration 0139
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
# ----- Main settings -----
@@
-35,6
+30,7
@@
check_vrfy:
warn dnslists = rbl.test.ex!==127.0.0.1
warn dnslists = rbl.test.ex!==127.0.0.3
warn dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
warn dnslists = rbl.test.ex!==127.0.0.1
warn dnslists = rbl.test.ex!==127.0.0.3
warn dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
+ warn dnslists = rbl.test.ex
accept
check_mail:
accept
check_mail:
@@
-85,7
+81,7
@@
local_delivery:
driver = appendfile
delivery_date_add
envelope_to_add
driver = appendfile
delivery_date_add
envelope_to_add
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
return_path_add
user = CALLER
return_path_add
user = CALLER