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 "-bP smtp_receive_timeout". Bug 2384
[users/heiko/exim.git]
/
test
/
confs
/
0290
diff --git
a/test/confs/0290
b/test/confs/0290
index 47b2cec345967012b0943cd80d2dbe2eabbbbe49..5ccb8451f9bba7cadcd5cc388401f19f76665295 100644
(file)
--- a/
test/confs/0290
+++ b/
test/confs/0290
@@
-3,26
+3,22
@@
FOOBAR=
FOO=inc1
BAR=.include "DIR/aux-fixed/TESTNUM.inc2"
FOOBAR=
FOO=inc1
BAR=.include "DIR/aux-fixed/TESTNUM.inc2"
-
R
T = receive_timeout = 1s
+
OP
T = receive_timeout = 1s
INC=
C1=#
C2=#
C1C2 this should be a comment
INC=
C1=#
C2=#
C1C2 this should be a comment
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
trusted_users = CALLER
trusted_users = CALLER
+primary_hostname = myhost.test.ex
# ----- Main settings -----
FOOBAR .include DIR/aux-fixed/TESTNUM.FOO
# ----- Main settings -----
FOOBAR .include DIR/aux-fixed/TESTNUM.FOO
-
R
T
+
OP
T
INC
remote_sort_domains = a:b:c
INC
remote_sort_domains = a:b:c