ph10 2005/01/14 11:36:18 GMT
Modified files:
exim-test-orig/AutoTest/aux 131.listR
exim-test-orig/AutoTest/confs 131
exim-test-orig/AutoTest/log 131
exim-test-orig/AutoTest/mail 131.ph10 131.unknown
exim-test-orig/AutoTest/scripts 131
Added files:
exim-test-orig/AutoTest/mail 131.PH10 131.PIPE
Log:
Updated test to include more cases of caseful_local_part.
Revision Changes Path
1.2 +1 -0 exim/exim-test-orig/AutoTest/aux/131.listR
1.2 +14 -1 exim/exim-test-orig/AutoTest/confs/131
1.2 +9 -0 exim/exim-test-orig/AutoTest/log/131
1.1 +13 -0 exim/exim-test-orig/AutoTest/mail/131.PH10 (new)
1.1 +1 -0 exim/exim-test-orig/AutoTest/mail/131.PIPE (new)
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/131.ph10
1.2 +14 -2 exim/exim-test-orig/AutoTest/mail/131.unknown
1.2 +16 -1 exim/exim-test-orig/AutoTest/scripts/131
Index: 131.listR
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/131.listR,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131.listR 8 Oct 2004 14:04:55 -0000 1.1
+++ 131.listR 14 Jan 2005 11:36:18 -0000 1.2
@@ -1,2 +1,3 @@
ph10 data for ph10
+PH10 data for PH10
known.domain data for known.domain
Index: 131
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/131,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131 8 Oct 2004 14:49:15 -0000 1.1
+++ 131 14 Jan 2005 11:36:18 -0000 1.2
@@ -17,6 +17,14 @@
begin routers
+topipe:
+ driver = accept
+ caseful_local_part
+ retry_use_local_part
+ domains = pipe.domain
+ local_parts = PIPE
+ transport = pipe
+
domainlist:
driver = manualroute
caseful_local_part
@@ -43,7 +51,7 @@
default2:
driver = accept
- headers_add = director: defaulted
+ headers_add = router: defaulted
retry_use_local_part
transport = appendfile
@@ -58,6 +66,11 @@
headers_add = "domain_data: $domain_data\n\
local_part_data: $local_part_data"
user = CALLER
+
+pipe:
+ driver = pipe
+ command = /bin/sh -c "echo $local_part $domain >DIR/test-mail/$local_part"
+ user = CALLER
# ----- Retry -----
Index: 131
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/131,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131 8 Oct 2004 14:49:31 -0000 1.1
+++ 131 14 Jan 2005 11:36:18 -0000 1.2
@@ -14,3 +14,12 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=283
1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10@??? R=domainlist T=appendfile
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=324
+1999-03-02 09:44:33 10HmbC-0005vi-00 => unknown@??? <UNKNOWN@???> R=default1 T=appendfile
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=318
+1999-03-02 09:44:33 10HmbD-0005vi-00 => PH10@??? R=domainlist T=appendfile
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=303
+1999-03-02 09:44:33 10HmbE-0005vi-00 => PIPE <PIPE@???> R=topipe T=pipe
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
Index: 131.PH10
====================================================================
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
id 10HmbD-0005vi-00
for PH10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbD-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
domainlist: dd=data for known.domain lpd=data for ph10
domain_data: data for known.domain
local_part_data: data for ph10
Test to uppercased local part PH10@???
Index: 131.PIPE
====================================================================
PIPE pipe.domain
Index: 131.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/131.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 131.ph10 14 Jan 2005 11:36:18 -0000 1.2
@@ -5,7 +5,7 @@
Message-Id: <E10HmaY-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-director: defaulted
+router: defaulted
domain_data:
local_part_data:
Index: 131.unknown
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/131.unknown,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131.unknown 8 Oct 2004 14:49:42 -0000 1.1
+++ 131.unknown 14 Jan 2005 11:36:18 -0000 1.2
@@ -5,7 +5,7 @@
Message-Id: <E10HmaX-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-director: defaulted
+router: defaulted
domain_data:
local_part_data:
@@ -17,9 +17,21 @@
Message-Id: <E10HmaZ-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-director: defaulted
+router: defaulted
domain_data:
local_part_data:
Test message
+
+From ph10@??? Tue Mar 02 09:44:33 1999
+Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
+ id 10HmbC-0005vi-00
+ for UNKNOWN@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@???>
+From: Philip Hazel <ph10@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+domain_data:
+local_part_data:
+
+Test to uppercased local part UNKNOWN@???
Index: 131
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/131,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 131 8 Oct 2004 14:49:52 -0000 1.1
+++ 131 14 Jan 2005 11:36:18 -0000 1.2
@@ -1,4 +1,4 @@
-0 $domain_data and $local_part_data
+0 $domain_data and $local_part_data and caseful $local_part handling
exim -odi unknown@???
Test message
.
@@ -21,5 +21,20 @@
0
exim -odi ph10@???
Test message
+.
+****
+0
+exim -odi UNKNOWN@???
+Test to uppercased local part UNKNOWN@???
+.
+****
+0
+exim -odi PH10@???
+Test to uppercased local part PH10@???
+.
+****
+0
+exim -odi PIPE@???
+Test to uppercased piped address.
.
****
