diff options
-rw-r--r-- | test/confs/0544 | 4 | ||||
-rw-r--r-- | test/stderr/0544 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/confs/0544 b/test/confs/0544 index f1a32b31a..ddf95e5ae 100644 --- a/test/confs/0544 +++ b/test/confs/0544 @@ -10,12 +10,12 @@ gecos_name = CALLER_NAME # ----- Main settings ----- -domainlist dlist = testdb;$domain +domainlist dlist = $domain acl_smtp_helo = check_helo acl_smtp_mail = check_mail acl_smtp_rcpt = check_rcpt -queue_smtp_domains = testdb;$domain +queue_smtp_domains = $domain qualify_domain = test.ex diff --git a/test/stderr/0544 b/test/stderr/0544 index 2d49eabcb..e8b01dfe0 100644 --- 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 -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 @@ -92,8 +92,8 @@ expanding: $sender_helo_name 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}} |