Fix small test buglet.
authorPhilip Hazel <ph10@hermes.cam.ac.uk>
Tue, 7 Nov 2006 14:20:37 +0000 (14:20 +0000)
committerPhilip Hazel <ph10@hermes.cam.ac.uk>
Tue, 7 Nov 2006 14:20:37 +0000 (14:20 +0000)
test/confs/0544
test/stderr/0544

index f1a32b31ade6a933d39e59c813341d6b209e54cf..ddf95e5ae73380040cf4daf2b251c7100e4ee3b0 100644 (file)
@@ -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
 
 
index 2d49eabcb18240400229bb94810a1633c57a5e35..e8b01dfe05ea57b6e6e30f716ef1998fd6310c93 100644 (file)
@@ -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}}