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
Fix non-TLS build
[users/heiko/exim.git]
/
test
/
confs
/
0260
diff --git
a/test/confs/0260
b/test/confs/0260
index b0c549d46b0a9331452f900ba90576ff8034608a..257ea82da437d035cd9fba01477c93e8058f0870 100644
(file)
--- a/
test/confs/0260
+++ b/
test/confs/0260
@@
-1,14
+1,8
@@
# Exim test configuration 0260
# Exim test configuration 0260
-exim_path = EXIM_PATH
-keep_environment =
-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 -----
@@
-20,7
+14,7
@@
begin transports
local_delivery:
driver = appendfile
local_delivery:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
bad_return:
user = CALLER
bad_return:
@@
-36,7
+30,7
@@
bad_uid:
exp_fail:
driver = appendfile
exp_fail:
driver = appendfile
- file = DIR/test-mail/$
local_part
+ file = DIR/test-mail/$
{bless:$local_part}
user = CALLER
home_directory = ${if rhubarb
user = CALLER
home_directory = ${if rhubarb