ph10 2006/11/07 14:20:37 GMT
Modified files:
exim-test/confs 0544
exim-test/stderr 0544
Log:
Fix small test buglet.
Revision Changes Path
1.2 +2 -2 exim/exim-test/confs/0544
1.2 +4 -4 exim/exim-test/stderr/0544
Index: 0544
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0544,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0544 31 Oct 2006 16:08:11 -0000 1.1
+++ 0544 7 Nov 2006 14:20:37 -0000 1.2
@@ -10,12 +10,12 @@
# ----- 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: 0544
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0544,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0544 31 Oct 2006 16:08:11 -0000 1.1
+++ 0544 7 Nov 2006 14:20:37 -0000 1.2
@@ -52,8 +52,8 @@
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@??? R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
LOG: MAIN
@@ -92,8 +92,8 @@
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}}