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
GnuTLS: clear errno before any data i/o op, so error logging does not see stale values
[users/heiko/exim.git]
/
test
/
confs
/
5000
diff --git
a/test/confs/5000
b/test/confs/5000
index 2ceeb06a842108a14c33efbd8479b0f98d219665..de9b4f8e83bef7d9266941d899bbfd77a235bc58 100644
(file)
--- a/
test/confs/5000
+++ b/
test/confs/5000
@@
-1,13
+1,10
@@
# Exim test configuration 5000
# Exim test configuration 5000
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+OPT =
+
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 -----
@@
-19,7
+16,7
@@
begin routers
localuser:
driver = accept
local_parts = userx
localuser:
driver = accept
local_parts = userx
- transport =
$h_maildir:appendfile
+ transport =
VALUE
# ----- Transports -----
# ----- Transports -----
@@
-38,7
+35,7
@@
maildir_tagged_appendfile:
directory = DIR/test-mail
envelope_to_add
maildir_format
directory = DIR/test-mail
envelope_to_add
maildir_format
- maildir_tag =
${expand:$h_tag:}
+ maildir_tag =
OPT
message_prefix =
quota = 20K
quota_size_regex = S=(\d+)$
message_prefix =
quota = 20K
quota_size_regex = S=(\d+)$
@@
-50,7
+47,7
@@
maildir_taggedX_appendfile:
directory = DIR/test-mail
envelope_to_add
maildir_format
directory = DIR/test-mail
envelope_to_add
maildir_format
- maildir_tag =
${expand:$h_tag:}
+ maildir_tag =
OPT
message_prefix =
quota = 20K
quota_size_regex = ,S=(\d+):
message_prefix =
quota = 20K
quota_size_regex = ,S=(\d+):