Fix MIME parsing of filenames specified using multiple parameters. Bug 3099

[exim.git] / test / stderr / 0157

diff --git a/test/stderr/0157 b/test/stderr/0157
index 3a5a6fd65c6aa204ad9708db36dd597fee311e4e..e5f23273c8b137e511ba50726672ac6602609657 100644 (file)
--- a/test/stderr/0157
+++ b/test/stderr/0157
@@ -21,9 +21,11 @@
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -50,9 +52,11 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -93,9 +97,11 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -108,10 +114,12 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
->>>  host in "V4NET.0.0.1 : V4NET.0.0.2"?
->>>   list element: V4NET.0.0.1
->>>   list element: V4NET.0.0.2
->>>   host in "V4NET.0.0.1 : V4NET.0.0.2"? yes (matched "V4NET.0.0.2")
+>>>   start sublist relay_hosts
+>>>    host in "V4NET.0.0.1 : V4NET.0.0.2"?
+>>>    ╎list element: V4NET.0.0.1
+>>>    ╎list element: V4NET.0.0.2
+>>>    ╎host in "V4NET.0.0.1 : V4NET.0.0.2"? yes (matched "V4NET.0.0.2")
+>>>   end sublist relay_hosts
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -126,9 +134,11 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -141,6 +151,9 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
+>>>   start sublist relay_hosts
+>>>  cached yes match for +relay_hosts
+>>>  cached lookup data = NULL
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -167,9 +180,11 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -182,10 +197,12 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
->>>  host in "V4NET.0.0.1 : V4NET.0.0.2"?
->>>   list element: V4NET.0.0.1
->>>   list element: V4NET.0.0.2
->>>  host in "V4NET.0.0.1 : V4NET.0.0.2"? no (end of list)
+>>>   start sublist relay_hosts
+>>>    host in "V4NET.0.0.1 : V4NET.0.0.2"?
+>>>    ╎list element: V4NET.0.0.1
+>>>    ╎list element: V4NET.0.0.2
+>>>    host in "V4NET.0.0.1 : V4NET.0.0.2"? no (end of list)
+>>>   end sublist relay_hosts
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)
@@ -204,9 +221,11 @@ LOG: H=(test) [V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> check domains = +local_domains
 >>> b.c in "+local_domains"?
 >>>  list element: +local_domains
->>>  b.c in "test.ex"?
->>>   list element: test.ex
->>>  b.c in "test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    b.c in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    b.c in "test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
@@ -219,6 +238,9 @@ LOG: H=(test) [V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
+>>>   start sublist relay_hosts
+>>>  cached no match for +relay_hosts
+>>>  cached lookup data = NULL
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)