Merge remote branch 'origin'

[exim.git] / test / stderr / 0544

diff --git a/test/stderr/0544 b/test/stderr/0544
index 2d49eabcb18240400229bb94810a1633c57a5e35..e8b01dfe05ea57b6e6e30f716ef1998fd6310c93 100644 (file)
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -52,8 +52,8 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-expanding: testdb;$domain
-   result: testdb;domain1.ex
+expanding: $domain
+   result: domain1.ex

 LOG: MAIN
   == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
 LOG: MAIN
 LOG: MAIN
   == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
 LOG: MAIN


@@ -92,8 +92,8 @@ expanding: $sender_helo_name
    result: ehlo.domain
 expanding: +dlist
    result: +dlist
    result: ehlo.domain
 expanding: +dlist
    result: +dlist

-expanding: testdb;$domain
-   result: testdb;ehlo.domain
+expanding: $domain
+   result: ehlo.domain

 condition: match_domain {$sender_helo_name}{+dlist}
    result: true
 expanding: ${if match_domain {$sender_helo_name}{+dlist}}
 condition: match_domain {$sender_helo_name}{+dlist}
    result: true
 expanding: ${if match_domain {$sender_helo_name}{+dlist}}