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 output changes resulting
[users/heiko/exim.git]
/
test
/
confs
/
0372
diff --git
a/test/confs/0372
b/test/confs/0372
index 34fc1aa24eb0bdcc5e8a4d1612d9ef491e7b5857..983d596a13dbd260e23d2ea3df17e1277a903fb4 100644
(file)
--- a/
test/confs/0372
+++ b/
test/confs/0372
@@
-1,13
+1,10
@@
# Exim test configuration 0372
# Exim test configuration 0372
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+STRICT=
+
+.include DIR/aux-var/std_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-17,7
+14,7
@@
acl_smtp_connect = a2
system_filter = DIR/aux-var/TESTNUM.F
trusted_users = CALLER
system_filter = DIR/aux-var/TESTNUM.F
trusted_users = CALLER
-
+STRICT
# ----- ACL -----
# ----- ACL -----
@@
-28,6
+25,8
@@
a1:
set acl_m0 = value for m0 is local_part: $local_part
set acl_m5 = value for m5 contains newline\nthere!
set acl_m9 = value for m9 is domain: $domain
set acl_m0 = value for m0 is local_part: $local_part
set acl_m5 = value for m5 contains newline\nthere!
set acl_m9 = value for m9 is domain: $domain
+ set acl_m_foo = value for mfoo is local_part: $local_part
+ set acl_m_bar = value for mbar is domain: $domain
accept local_parts = a
set acl_m0 = value for m0 is local_part: $local_part
accept local_parts = a
set acl_m0 = value for m0 is local_part: $local_part
@@
-37,6
+36,8
@@
a2:
accept set acl_c0 = value for c0 is ip: $sender_host_address
set acl_c5 = c5 has a newline\nthere!
set acl_c9 = value for c9 is name: $sender_host_name
accept set acl_c0 = value for c0 is ip: $sender_host_address
set acl_c5 = c5 has a newline\nthere!
set acl_c9 = value for c9 is name: $sender_host_name
+ set acl_c_foo = value for c_foo is ip: $sender_host_address
+ set acl_c_bar = value for c_bar is name: $sender_host_name
# ----- Routers -----
# ----- Routers -----
@@
-51,7
+52,9
@@
r1:
acl_c9="$acl_c9"\nacl_m0="$acl_m0"\nacl_m1="$acl_m1"\n\
acl_m2="$acl_m2"\nacl_m3="$acl_m3"\nacl_m4="$acl_m4"\n\
acl_m5="$acl_m5"\nacl_m6="$acl_m6"\nacl_m7="$acl_m7"\n\
acl_c9="$acl_c9"\nacl_m0="$acl_m0"\nacl_m1="$acl_m1"\n\
acl_m2="$acl_m2"\nacl_m3="$acl_m3"\nacl_m4="$acl_m4"\n\
acl_m5="$acl_m5"\nacl_m6="$acl_m6"\nacl_m7="$acl_m7"\n\
- acl_m8="$acl_m8"\nacl_m9="$acl_m9"
+ acl_m8="$acl_m8"\nacl_m9="$acl_m9"\n\
+ acl_m_foo="$acl_m_foo"\nacl_m_bar="$acl_m_bar"\n\
+ acl_c_foo="$acl_c_foo"\nacl_c_bar="$acl_c_bar"
transport = t1
transport = t1
@@
-64,5
+67,4
@@
t1:
file = /dev/null
user = CALLER
file = /dev/null
user = CALLER
-
# End
# End