ph10 2005/05/17 16:00:05 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src acl.c receive.c
exim-test-orig/AutoTest/log 005 028 061 133 206 207 324 335
341 342 522 578 585 590
exim-test-orig/AutoTest/mail 005.ph10 028.ph10 061.ph10
133.forwarder 206.copies 324.ph10
335.exbounce 335.mug99 335.ph10
335.unqualified 585.ph10
exim-test-orig/AutoTest/msglog 206.10HmaY-0005vi-00
207.10HmbA-0005vi-00
207.10HmbC-0005vi-00
exim-test-orig/AutoTest/rejectlog 324 335
exim-test-orig/AutoTest/scripts 571
exim-test-orig/AutoTest/src server.c
exim-test-orig/AutoTest/stderr 335 341 342
exim-test-orig/AutoTest/stdout 335 571 578
Log:
Installed a modified version of Tony's submission enhancement patch +
two small bugfixes.
Revision Changes Path
1.139 +9 -0 exim/exim-doc/doc-txt/ChangeLog
1.42 +9 -0 exim/exim-doc/doc-txt/NewStuff
1.32 +11 -2 exim/exim-src/src/acl.c
1.17 +37 -22 exim/exim-src/src/receive.c
1.3 +3 -3 exim/exim-test-orig/AutoTest/log/005
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/028
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/061
1.3 +6 -6 exim/exim-test-orig/AutoTest/log/133
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/206
1.2 +2 -2 exim/exim-test-orig/AutoTest/log/207
1.2 +3 -3 exim/exim-test-orig/AutoTest/log/324
1.3 +24 -24 exim/exim-test-orig/AutoTest/log/335
1.2 +2 -2 exim/exim-test-orig/AutoTest/log/341
1.2 +2 -2 exim/exim-test-orig/AutoTest/log/342
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/522
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/578
1.4 +1 -1 exim/exim-test-orig/AutoTest/log/585
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/590
1.3 +3 -3 exim/exim-test-orig/AutoTest/mail/005.ph10
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/028.ph10
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/061.ph10
1.3 +2 -2 exim/exim-test-orig/AutoTest/mail/133.forwarder
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/206.copies
1.2 +2 -2 exim/exim-test-orig/AutoTest/mail/324.ph10
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/335.exbounce
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/335.mug99
1.2 +13 -13 exim/exim-test-orig/AutoTest/mail/335.ph10
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/335.unqualified
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/585.ph10
1.2 +1 -1 exim/exim-test-orig/AutoTest/msglog/206.10HmaY-0005vi-00
1.2 +1 -1 exim/exim-test-orig/AutoTest/msglog/207.10HmbA-0005vi-00
1.2 +1 -1 exim/exim-test-orig/AutoTest/msglog/207.10HmbC-0005vi-00
1.2 +1 -1 exim/exim-test-orig/AutoTest/rejectlog/324
1.2 +10 -10 exim/exim-test-orig/AutoTest/rejectlog/335
1.5 +39 -0 exim/exim-test-orig/AutoTest/scripts/571
1.2 +45 -3 exim/exim-test-orig/AutoTest/src/server.c
1.3 +4 -4 exim/exim-test-orig/AutoTest/stderr/335
1.2 +2 -2 exim/exim-test-orig/AutoTest/stderr/341
1.3 +6 -6 exim/exim-test-orig/AutoTest/stderr/342
1.2 +5 -5 exim/exim-test-orig/AutoTest/stdout/335
1.3 +57 -1 exim/exim-test-orig/AutoTest/stdout/571
1.2 +1 -1 exim/exim-test-orig/AutoTest/stdout/578
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- ChangeLog 17 May 2005 11:20:32 -0000 1.138
+++ ChangeLog 17 May 2005 15:00:04 -0000 1.139
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.138 2005/05/17 11:20:32 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.139 2005/05/17 15:00:04 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -23,6 +23,15 @@
was being output only once per connection, rather than after each
occurrence (because it was using the same function as for successful
"warn" verbs). This seems wrong, so I have changed it.
+
+TF/02 Two buglets in acl.c which caused Exim to read a few bytes of memory that
+ it should not have, which might have caused a crash in the right
+ circumstances, but probably never did.
+
+PH/04 Installed a modified version of Tony Finch's patch to make submission
+ mode fix the return path as well as the Sender: header line, and to
+ add a /name= option so that you can make the user's friendly name appear
+ in the header line.
Exim version 4.51
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- NewStuff 17 May 2005 09:53:34 -0000 1.41
+++ NewStuff 17 May 2005 15:00:04 -0000 1.42
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.41 2005/05/17 09:53:34 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.42 2005/05/17 15:00:04 ph10 Exp $
New Features in Exim
--------------------
@@ -80,6 +80,15 @@
The value of FULLECHO defaults to "@", the flag character that suppresses
command reflection in "make". When you ask for the full output, it is
given in addition to the the short output.
+
+PH/02 There have been two changes concerned with submission mode:
+
+ (a) A new option, /name=value, makes it possible to supply a user name
+ to be inserted into any created Sender: header line. Typically, this
+ would be looked up from $authenticated_id.
+
+ (b) The envelope sender address is forced to be the same as the
+ submission mode sender address.
Version 4.51
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- acl.c 17 May 2005 11:20:32 -0000 1.31
+++ acl.c 17 May 2005 15:00:04 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.31 2005/05/17 11:20:32 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.32 2005/05/17 15:00:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2107,7 +2107,7 @@
{
uschar *pp = p + 1;
while (*pp != 0) pp++;
- fake_reject_text = expand_string(string_copyn(p+1, pp-p));
+ fake_reject_text = expand_string(string_copyn(p+1, pp-p-1));
p = pp;
}
else
@@ -2127,6 +2127,7 @@
break;
case CONTROL_SUBMISSION:
+ originator_name = US"";
submission_mode = TRUE;
while (*p == '/')
{
@@ -2140,7 +2141,15 @@
{
uschar *pp = p + 8;
while (*pp != 0 && *pp != '/') pp++;
- submission_domain = string_copyn(p+8, pp-p);
+ submission_domain = string_copyn(p+8, pp-p-8);
+ p = pp;
+ }
+ else if (Ustrncmp(p, "/name=", 6) == 0)
+ {
+ uschar *pp = p + 6;
+ while (*pp != 0 && *pp != '/') pp++;
+ originator_name = string_copy(parse_fix_phrase(p+6, pp-p-6,
+ big_buffer, big_buffer_size));
p = pp;
}
else break;
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- receive.c 27 Apr 2005 13:29:32 -0000 1.16
+++ receive.c 17 May 2005 15:00:04 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.16 2005/04/27 13:29:32 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/receive.c,v 1.17 2005/05/17 15:00:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2341,31 +2341,36 @@
if (sender_address[0] == 0)
{
+ uschar *fromstart, *fromend;
+
+ fromstart = string_sprintf("%sFrom: %s%s", resent_prefix,
+ originator_name, (originator_name[0] == 0)? "" : " <");
+ fromend = (originator_name[0] == 0)? US"" : US">";
+
if (sender_local || local_error_message)
{
- header_add(htype_from, "%sFrom: %s%s%s@%s%s\n", resent_prefix,
- originator_name,
- (originator_name[0] == 0)? "" : " <",
- local_part_quote(originator_login),
- qualify_domain_sender,
- (originator_name[0] == 0)? "" : ">");
+ header_add(htype_from, "%s%s@%s%s\n", fromstart,
+ local_part_quote(originator_login), qualify_domain_sender,
+ fromend);
}
else if (submission_mode && authenticated_id != NULL)
{
if (submission_domain == NULL)
{
- header_add(htype_from, "%sFrom: %s@%s\n", resent_prefix,
- local_part_quote(authenticated_id), qualify_domain_sender);
+ header_add(htype_from, "%s%s@%s%s\n", fromstart,
+ local_part_quote(authenticated_id), qualify_domain_sender,
+ fromend);
}
else if (submission_domain[0] == 0) /* empty => whole address set */
{
- header_add(htype_from, "%sFrom: %s\n", resent_prefix,
- authenticated_id);
+ header_add(htype_from, "%s%s%s\n", fromstart, authenticated_id,
+ fromend);
}
else
{
- header_add(htype_from, "%sFrom: %s@%s\n", resent_prefix,
- local_part_quote(authenticated_id), submission_domain);
+ header_add(htype_from, "%s%s@%s%s\n", fromstart,
+ local_part_quote(authenticated_id), submission_domain,
+ fromend);
}
from_header = header_last; /* To get it checked for Sender: */
}
@@ -2377,15 +2382,12 @@
else
{
- if (!smtp_input || sender_local)
- header_add(htype_from, "%sFrom: %s%s%s%s\n",
- resent_prefix, originator_name,
- (originator_name[0] == 0)? "" : " <",
- (sender_address_unrewritten == NULL)?
- sender_address : sender_address_unrewritten,
- (originator_name[0] == 0)? "" : ">");
- else
- header_add(htype_from, "%sFrom: %s\n", resent_prefix, sender_address);
+ header_add(htype_from, "%sFrom: %s%s%s%s\n", resent_prefix,
+ originator_name,
+ (originator_name[0] == 0)? "" : " <",
+ (sender_address_unrewritten == NULL)?
+ sender_address : sender_address_unrewritten,
+ (originator_name[0] == 0)? "" : ">");
from_header = header_last; /* To get it checked for Sender: */
}
@@ -2466,12 +2468,25 @@
if (make_sender)
{
- if (submission_mode)
+ if (submission_mode && originator_name[0] == 0)
header_add(htype_sender, "%sSender: %s\n", resent_prefix,
generated_sender_address);
else
header_add(htype_sender, "%sSender: %s <%s>\n",
resent_prefix, originator_name, generated_sender_address);
+ }
+
+ /* Ensure that a non-null envelope sender address corresponds to the
+ submission mode sender address. */
+
+ if (submission_mode && sender_address[0] != 0)
+ {
+ if (sender_address_unrewritten == NULL)
+ sender_address_unrewritten = sender_address;
+ sender_address = generated_sender_address;
+ log_write(L_address_rewrite, LOG_MAIN,
+ "\"%s\" from env-from rewritten as \"%s\" by submission mode",
+ sender_address_unrewritten, generated_sender_address);
}
}
Index: 005
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/005,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 005 27 Apr 2005 13:29:33 -0000 1.2
+++ 005 17 May 2005 15:00:04 -0000 1.3
@@ -1,9 +1,9 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=366
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=381
1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=346
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=361
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=364
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=379
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 028
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/028,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 028 8 Oct 2004 14:49:31 -0000 1.1
+++ 028 17 May 2005 15:00:04 -0000 1.2
@@ -10,7 +10,7 @@
1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=307
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=313
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=328
1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
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=319
Index: 061
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/061,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 061 8 Oct 2004 14:49:31 -0000 1.1
+++ 061 17 May 2005 15:00:04 -0000 1.2
@@ -10,7 +10,7 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <postmaster@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 => /source/exim4/AutoTest/test-mail/rbl <system-filter> T=file
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= postmaster@??? U=ph10 P=local-smtp S=316
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= postmaster@??? U=ph10 P=local-smtp S=331
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=ph10 P=local S=381
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
Index: 133
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/133,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 133 28 Apr 2005 13:06:33 -0000 1.2
+++ 133 17 May 2005 15:00:04 -0000 1.3
@@ -1,24 +1,24 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=249
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=264
1999-03-02 09:44:33 10HmaX-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** forwarder2@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1005
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1020
1999-03-02 09:44:33 10HmaY-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
1999-03-02 09:44:33 10HmaY-0005vi-00 abcd@???: error ignored
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1036
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1051
1999-03-02 09:44:33 10HmaZ-0005vi-00 => forwarder <forwarder@???> R=smart T=local_delivery
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=279
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= abcd@??? U=ph10 P=local-smtp S=294
1999-03-02 09:44:33 10HmbA-0005vi-00 == forwarder2@??? R=forward defer (-17): error in filter file: errors_to must point to the caller's address
1999-03-02 09:44:33 10HmbA-0005vi-00 ** unknown@??? <forwarder@???> R=unknown: Address unknown (:fail:)
1999-03-02 09:44:33 10HmbA-0005vi-00 ** forwarder2@???: retry timeout exceeded
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=974
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=989
1999-03-02 09:44:33 10HmbB-0005vi-00 ** abcd@??? R=fail_remote_domains: unrouteable mail domain "x.y.z" (:fail:)
1999-03-02 09:44:33 10HmbB-0005vi-00 abcd@???: error ignored
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1005
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1020
1999-03-02 09:44:33 10HmbC-0005vi-00 => forwarder <forwarder@???> R=smart T=local_delivery
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
Index: 206
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/206,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 206 8 Oct 2004 14:49:31 -0000 1.1
+++ 206 17 May 2005 15:00:04 -0000 1.2
@@ -4,7 +4,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 10.0.0.1 [10.0.0.1]: Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=passall T=pass_on defer (110): Connection timed out
1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=passall T=pass_on defer (110): Connection timed out
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=ph10 P=local-smtp S=249
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=ph10 P=local-smtp S=264
1999-03-02 09:44:33 10HmaY-0005vi-00 => abc@??? R=checkcopy T=makecopy
1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@??? R=checkcopy T=makecopy
1999-03-02 09:44:33 10HmaY-0005vi-00 == abc@??? R=passall T=pass_on defer (-53): retry time not reached for any host
Index: 207
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/207,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 207 8 Oct 2004 14:49:31 -0000 1.1
+++ 207 17 May 2005 15:00:04 -0000 1.2
@@ -4,8 +4,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 == ph10@??? R=check_file T=pass_on defer (110): Connection timed out
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1229
1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph10@??? R=passall T=pass_on defer (-53): retry time not reached for any host
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= doesn't@matter U=ph10 P=local-bsmtp S=374 id=E10HmbB-0005vi-00@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= doesn't@matter U=ph10 P=local-bsmtp S=389 id=E10HmbB-0005vi-00@???
1999-03-02 09:44:33 10HmbA-0005vi-00 ** xyz@???: Unrouteable address
1999-03-02 09:44:33 10HmbA-0005vi-00 == abc@??? R=check_file T=pass_on defer (-53): retry time not reached for any host
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1173
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1188
1999-03-02 09:44:33 10HmbC-0005vi-00 == doesn't@matter R=passall T=pass_on defer (-53): retry time not reached for any host
Index: 324
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/324,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 324 8 Oct 2004 14:49:31 -0000 1.1
+++ 324 17 May 2005 15:00:04 -0000 1.2
@@ -1,12 +1,12 @@
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=ph10 P=local-smtp S=269
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=ph10 P=local-smtp S=284
1999-03-02 09:44:33 10HmaX-0005vi-00 U=ph10 F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From" header is: @
1999-03-02 09:44:33 10HmaY-0005vi-00 U=ph10 F=<> rejected after DATA: domain missing or malformed: failing address in "From" header is: @
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=ph10 F=<> rejected after DATA: there is no valid sender in any header line
1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> U=ph10 P=local-smtp S=301
1999-03-02 09:44:33 10HmbA-0005vi-00 U=ph10 F=<x@y> rejected after DATA: body contains trigger
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y U=ph10 P=local-smtp S=278
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y U=ph10 P=local-smtp S=293
1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y U=ph10 P=local-smtp S=337
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y U=ph10 P=local-smtp S=352
1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=r2 T=local_delivery
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
Index: 335
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/335,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335 28 Apr 2005 13:06:33 -0000 1.2
+++ 335 17 May 2005 15:00:04 -0000 1.3
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= x@y U=ph10 P=local-smtp S=251
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= x@y U=ph10 P=local-smtp S=266
1999-03-02 09:44:33 10HmbM-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=286
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=301
1999-03-02 09:44:33 10HmbN-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp rejected by local_scan(): Administrative prohibition
@@ -9,13 +9,13 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp rejected by local_scan(): this message isn't wanted\n and we tell it on two lines\n
1999-03-02 09:44:33 10HmbC-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp temporarily rejected by local_scan(): Temporary local problem
1999-03-02 09:44:33 10HmbD-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp temporarily rejected by local_scan(): this message isn't wanted just now\n
-1999-03-02 09:44:33 10HmbO-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=345
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=360
1999-03-02 09:44:33 10HmbO-0005vi-00 => blackhole (local_scan discarded recipients)
1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbP-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=388
+1999-03-02 09:44:33 10HmbP-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=403
1999-03-02 09:44:33 10HmbP-0005vi-00 => mug99 <mug99@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=404
+1999-03-02 09:44:33 10HmbQ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=419
1999-03-02 09:44:33 10HmbQ-0005vi-00 => blackhole *this is a blackhole message*
1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbE-0005vi-00 F=test-local-scan@y U=ph10 P=local rejected by local_scan(): this message isn't wanted\n
@@ -27,66 +27,66 @@
1999-03-02 09:44:33 10HmbS-0005vi-00 => test-local-scan <test-local-scan@y> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbS-0005vi-00 Completed
1999-03-02 09:44:33 10HmbG-0005vi-00 F=test-local-scan@y U=ph10 P=local rejected by local_scan(): this message isn't wanted\n
-1999-03-02 09:44:33 10HmbT-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=362
+1999-03-02 09:44:33 10HmbT-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=377
1999-03-02 09:44:33 10HmbT-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbT-0005vi-00 Completed
1999-03-02 09:44:33 10HmbH-0005vi-00 local_scan() function timed out - message temporarily rejected (size 29)
1999-03-02 09:44:33 10HmbI-0005vi-00 local_scan() function timed out - message temporarily rejected (size 30)
-1999-03-02 09:44:33 10HmbU-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=460
+1999-03-02 09:44:33 10HmbU-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=475
1999-03-02 09:44:33 10HmbU-0005vi-00 ** bounce@??? R=r0: bounced (:fail:)
-1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1205
+1999-03-02 09:44:33 10HmbV-0005vi-00 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1220
1999-03-02 09:44:33 10HmbV-0005vi-00 => exbounce <exbounce@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbV-0005vi-00 Completed
1999-03-02 09:44:33 10HmbU-0005vi-00 Completed
1999-03-02 09:44:33 10HmbJ-0005vi-00 F=test-local-scan@y U=ph10 P=local-bsmtp rejected by local_scan(): not wanted -bS\n
-1999-03-02 09:44:33 10HmbW-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=407
+1999-03-02 09:44:33 10HmbW-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=422
1999-03-02 09:44:33 10HmbW-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbW-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbX-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=269
+1999-03-02 09:44:33 10HmbX-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=284
1999-03-02 09:44:33 10HmbX-0005vi-00 *> ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 test write to LOG_MAIN
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=269
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=284
1999-03-02 09:44:33 10HmaX-0005vi-00 *> ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmbK-0005vi-00 F=test-local-scan@y U=ph10 P=local-bsmtp rejected by local_scan(): not wanted -bS\n
1999-03-02 09:44:33 10HmbL-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp temporarily rejected by local_scan(): Temporary local problem
-1999-03-02 09:44:33 10HmbY-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=375
+1999-03-02 09:44:33 10HmbY-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=390
1999-03-02 09:44:33 10HmbY-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbZ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=368
+1999-03-02 09:44:33 10HmbZ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=383
1999-03-02 09:44:33 10HmbZ-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmbZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcA-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=352
+1999-03-02 09:44:33 10HmcA-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=367
1999-03-02 09:44:33 10HmcA-0005vi-00 frozen by local_scan()
-1999-03-02 09:44:33 10HmcB-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=351
+1999-03-02 09:44:33 10HmcB-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=366
1999-03-02 09:44:33 10HmcB-0005vi-00 no immediate delivery: queued by local_scan()
1999-03-02 09:44:33 10HmaY-0005vi-00 test write to LOG_MAIN
1999-03-02 09:44:33 10HmaY-0005vi-00 local_scan() function crashed with signal 11 - message temporarily rejected (size 35)
-1999-03-02 09:44:33 10HmcC-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=414
+1999-03-02 09:44:33 10HmcC-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=429
1999-03-02 09:44:33 10HmcC-0005vi-00 => unqualified <unqualified@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcD-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=431
+1999-03-02 09:44:33 10HmcD-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=446
1999-03-02 09:44:33 10HmcD-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcE-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=364
+1999-03-02 09:44:33 10HmcE-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=379
1999-03-02 09:44:33 10HmcE-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcF-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=399
+1999-03-02 09:44:33 10HmcF-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=414
1999-03-02 09:44:33 10HmcF-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcG-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=399
+1999-03-02 09:44:33 10HmcG-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=414
1999-03-02 09:44:33 10HmcG-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcH-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=395
+1999-03-02 09:44:33 10HmcH-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=410
1999-03-02 09:44:33 10HmcH-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcH-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcI-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=400
+1999-03-02 09:44:33 10HmcI-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=415
1999-03-02 09:44:33 10HmcI-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcI-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcJ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=374
+1999-03-02 09:44:33 10HmcJ-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=389
1999-03-02 09:44:33 10HmcJ-0005vi-00 => blackhole (local_scan discarded recipients)
1999-03-02 09:44:33 10HmcJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcK-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=375
+1999-03-02 09:44:33 10HmcK-0005vi-00 <= test-local-scan@y U=ph10 P=local-smtp S=390
1999-03-02 09:44:33 10HmcK-0005vi-00 => ph10 <ph10@???> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmcK-0005vi-00 Completed
Index: 341
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/341,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 341 8 Oct 2004 14:49:31 -0000 1.1
+++ 341 17 May 2005 15:00:04 -0000 1.2
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=ph10 P=local-smtp S=227
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=ph10 P=local-smtp S=242
1999-03-02 09:44:33 10HmaX-0005vi-00 => one <one@z> R=r1 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=ph10 P=local-smtp S=227
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=ph10 P=local-smtp S=242
1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: more than 1 messages received in one connection
1999-03-02 09:44:33 rejected MAIL command U=ph10: too many messages in one connection
1999-03-02 09:44:33 rejected MAIL command U=ph10: too many messages in one connection
Index: 342
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/342,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 342 8 Oct 2004 14:49:31 -0000 1.1
+++ 342 17 May 2005 15:00:04 -0000 1.2
@@ -1,5 +1,5 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=ph10 P=local-smtp S=216
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=ph10 P=local-smtp S=227
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=ph10 P=local-smtp S=231
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=ph10 P=local-smtp S=242
1999-03-02 09:44:33 U=ph10 F=<x@y> rejected RCPT <reject@z>
1999-03-02 09:44:33 U=ph10 F=<x@y> rejected RCPT <reject@z>
1999-03-02 09:44:33 U=ph10 F=<x@y> rejected RCPT <reject@z>
Index: 522
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/522,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 522 8 Oct 2004 14:49:31 -0000 1.1
+++ 522 17 May 2005 15:00:04 -0000 1.2
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> U=ph10 P=local S=246
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> U=ph10 P=local-esmtp S=271
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> U=ph10 P=local-esmtp S=286
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> U=ph10 P=local-esmtp S=246
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/578,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 578 28 Apr 2005 13:06:33 -0000 1.2
+++ 578 17 May 2005 15:00:04 -0000 1.3
@@ -40,11 +40,11 @@
1999-03-02 09:44:33 10HmbH-0005vi-00 ** mua_wrapper is set but recipients cannot all be delivered in one transaction
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=254
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=269
1999-03-02 09:44:33 10HmbI-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbI-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=270
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=285
1999-03-02 09:44:33 10HmbJ-0005vi-00 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 10HmbJ-0005vi-00 ::1 [::1]: Connection refused
1999-03-02 09:44:33 10HmbJ-0005vi-00 ** a@??? R=r9 T=t1: Connection refused
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/585,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 585 5 Nov 2004 16:53:28 -0000 1.3
+++ 585 17 May 2005 15:00:04 -0000 1.4
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 U=ph10 sender verify fail for <x@y>: Unrouteable address
1999-03-02 09:44:33 U=ph10 rejected DATA: sender verify failed (route): Sender verify failed
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= postmaster@y U=ph10 P=local-smtp S=297
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= postmaster@y U=ph10 P=local-smtp S=312
1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@y> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 590
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/590,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 590 18 Oct 2004 11:36:23 -0000 1.1
+++ 590 17 May 2005 15:00:04 -0000 1.2
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=ph10 F=<ph10@???> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=269
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-smtp S=254
1999-03-02 09:44:33 U=ph10 temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL
1999-03-02 09:44:33 ACL for QUIT returned ERROR: cannot use "control=freeze" in QUIT ACL
1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ph10@???> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL
Index: 005.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/005.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 005.ph10 27 Apr 2005 13:29:33 -0000 1.2
+++ 005.ph10 17 May 2005 15:00:04 -0000 1.3
@@ -6,7 +6,7 @@
id 10HmaX-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaX-0005vi-00.a-b-c-@???>
-From: ph10@???
+From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 4
X-local-user: uid=1169 gid=1169
@@ -27,7 +27,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Subject: second
Message-Id: <E10HmaY-0005vi-00.a-b-c-@???>
-From: ph10@???
+From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 3
X-local-user: uid=1169 gid=1169
@@ -47,7 +47,7 @@
Subject: third
Reply-to: some@body
Message-Id: <E10HmaZ-0005vi-00.a-b-c-@???>
-From: ph10@???
+From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-acl-message-linecount: 4
X-local-user: uid=1169 gid=1169
Index: 028.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/028.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 028.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 028.ph10 17 May 2005 15:00:04 -0000 1.2
@@ -63,7 +63,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Sender: Sender in original <sender@???>
Message-Id: <E10HmbB-0005vi-00@???>
-From: ph10@???
+From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
This is a test message 5.
Index: 061.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/061.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 061.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 061.ph10 17 May 2005 15:00:04 -0000 1.2
@@ -32,7 +32,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
sysmail: yes
Message-Id: <E10HmaZ-0005vi-00@???>
-From: postmaster@???
+From: Philip Hazel <postmaster@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Testing mail from system filter
Index: 133.forwarder
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/133.forwarder,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 133.forwarder 28 Apr 2005 13:06:34 -0000 1.2
+++ 133.forwarder 17 May 2005 15:00:04 -0000 1.3
@@ -29,7 +29,7 @@
Received: from ph10 by xoanon.csi.cam.ac.uk with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaX-0005vi-00@???>
-From: abcd@???
+From: Philip Hazel <abcd@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Test message.
@@ -65,7 +65,7 @@
Received: from ph10 by xoanon.csi.cam.ac.uk with local-smtp (Exim x.yz)
id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbA-0005vi-00@???>
-From: abcd@???
+From: Philip Hazel <abcd@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Index: 206.copies
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/206.copies,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 206.copies 8 Oct 2004 14:49:42 -0000 1.1
+++ 206.copies 17 May 2005 15:00:04 -0000 1.2
@@ -17,7 +17,7 @@
Received: from ph10 by xoanon.csi.cam.ac.uk with local-smtp (Exim x.yz)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmaY-0005vi-00@???>
-From: doesn't@matter
+From: Philip Hazel <doesn't@matter>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Test two.
Index: 324.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/324.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 324.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 324.ph10 17 May 2005 15:00:04 -0000 1.2
@@ -3,7 +3,7 @@
id 10HmbD-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbD-0005vi-00@???>
-From: x@y
+From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-warning: this is a test warning
@@ -16,7 +16,7 @@
to: group name: x@y, p@q;
reply-to: group name: a@b, c@d;
Message-Id: <E10HmbE-0005vi-00@???>
-From: x@y
+From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-warning: this is a test warning
Index: 335.exbounce
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/335.exbounce,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335.exbounce 28 Apr 2005 13:06:34 -0000 1.2
+++ 335.exbounce 17 May 2005 15:00:04 -0000 1.3
@@ -30,7 +30,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: sendto bounce@??? exbounce@???
Message-Id: <E10HmbU-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing, wa
Index: 335.mug99
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/335.mug99,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 335.mug99 8 Oct 2004 14:49:42 -0000 1.1
+++ 335.mug99 17 May 2005 15:00:04 -0000 1.2
@@ -4,7 +4,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: sendto mug99@???
Message-Id: <E10HmbP-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing, wa
Index: 335.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/335.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 335.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 335.ph10 17 May 2005 15:00:04 -0000 1.2
@@ -3,7 +3,7 @@
id 10HmbM-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbM-0005vi-00@???>
-From: x@y
+From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Testing, testing
@@ -13,7 +13,7 @@
id 10HmbN-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbN-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
@@ -25,7 +25,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: accept A=orses b=mutton
Message-Id: <E10HmbT-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -41,7 +41,7 @@
c=forthighlanders
some newlines in here
Message-Id: <E10HmbW-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -55,7 +55,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: accept_expand sender=$sender_address
Message-Id: <E10HmbY-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -69,7 +69,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: accept_expand sender=$rhubarb
Message-Id: <E10HmbZ-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -85,7 +85,7 @@
remove-me: this is the first one
remove-me : this is the third one
Message-Id: <E10HmcD-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -98,7 +98,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: header_remove 0 remove-me
Message-Id: <E10HmcE-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -112,7 +112,7 @@
X-new: added
local-scan: header_add_at_position TT received X-new: added
Message-Id: <E10HmcF-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -126,7 +126,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: header_add_at_position FT received X-new: added
Message-Id: <E10HmcG-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -140,7 +140,7 @@
local-scan: header_add_at_position FT From X-new: added
Message-Id: <E10HmcH-0005vi-00@???>
X-new: added
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -154,7 +154,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: header_add_at_position FT Non-exist X-new: added
Message-Id: <E10HmcI-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -168,7 +168,7 @@
local-scan: remove abcd@???
remove-rc: FALSE
Message-Id: <E10HmcK-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
Index: 335.unqualified
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/335.unqualified,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 335.unqualified 8 Oct 2004 14:49:42 -0000 1.1
+++ 335.unqualified 17 May 2005 15:00:04 -0000 1.2
@@ -4,7 +4,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: sendto unqualified
Message-Id: <E10HmcC-0005vi-00@???>
-From: test-local-scan@y
+From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing, wa
Index: 585.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/585.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 585.ph10 19 Oct 2004 11:29:25 -0000 1.2
+++ 585.ph10 17 May 2005 15:00:04 -0000 1.3
@@ -4,7 +4,7 @@
for ph10@y; Tue, 2 Mar 1999 09:44:33 +0000
Subject: testing
Message-Id: <E10HmaX-0005vi-00@???>
-From: postmaster@y
+From: Philip Hazel <postmaster@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-warning: this is a test warning (ph10@y)
Index: 206.10HmaY-0005vi-00
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/206.10HmaY-0005vi-00,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 206.10HmaY-0005vi-00 8 Oct 2004 14:49:49 -0000 1.1
+++ 206.10HmaY-0005vi-00 17 May 2005 15:00:05 -0000 1.2
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-smtp S=249
+1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-smtp S=264
1999-03-02 09:44:33 abc@??? <abc@???>: makecopy transport succeeded
1999-03-02 09:44:33 xyz@??? <xyz@???>: makecopy transport succeeded
1999-03-02 09:44:33 abc@??? R=passall T=pass_on defer (-53): retry time not reached for any host
Index: 207.10HmbA-0005vi-00
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/207.10HmbA-0005vi-00,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 207.10HmbA-0005vi-00 8 Oct 2004 14:49:49 -0000 1.1
+++ 207.10HmbA-0005vi-00 17 May 2005 15:00:05 -0000 1.2
@@ -1,3 +1,3 @@
-1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-bsmtp S=374 id=E10HmbB-0005vi-00@???
+1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-bsmtp S=389 id=E10HmbB-0005vi-00@???
1999-03-02 09:44:33 routing failed for xyz@???: Unrouteable address
1999-03-02 09:44:33 abc@??? R=check_file T=pass_on defer (-53): retry time not reached for any host
Index: 207.10HmbC-0005vi-00
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/207.10HmbC-0005vi-00,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 207.10HmbC-0005vi-00 8 Oct 2004 14:49:49 -0000 1.1
+++ 207.10HmbC-0005vi-00 17 May 2005 15:00:05 -0000 1.2
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=exim P=local S=1173
+1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=exim P=local S=1188
1999-03-02 09:44:33 doesn't@matter R=passall T=pass_on defer (-53): retry time not reached for any host
Index: 324
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/324,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 324 8 Oct 2004 14:49:51 -0000 1.1
+++ 324 17 May 2005 15:00:05 -0000 1.2
@@ -33,5 +33,5 @@
id 10HmbA-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbA-0005vi-00@???>
-F From: x@y
+F From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Index: 335
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/335,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 335 8 Oct 2004 14:49:51 -0000 1.1
+++ 335 17 May 2005 15:00:05 -0000 1.2
@@ -6,7 +6,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: reject
I Message-Id: <E10HmaZ-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -18,7 +18,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: reject this message isn't wanted
I Message-Id: <E10HmbA-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -31,7 +31,7 @@
local-scan: reject this message isn't wanted
and we tell it on two lines
I Message-Id: <E10HmbB-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -43,7 +43,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: tempreject
I Message-Id: <E10HmbC-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -55,7 +55,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: tempreject this message isn't wanted just now
I Message-Id: <E10HmbD-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -103,7 +103,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan:timeout
I Message-Id: <E10HmbH-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: test test
@@ -127,7 +127,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: reject not wanted -bS
I Message-Id: <E10HmbJ-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
@@ -138,7 +138,7 @@
id 10HmaX-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaX-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
1999-03-02 09:44:33 10HmbK-0005vi-00 F=test-local-scan@y U=ph10 P=local-bsmtp rejected by local_scan(): not wanted -bS\n
1999-03-02 09:44:33 10HmbL-0005vi-00 F=test-local-scan@y U=ph10 P=local-smtp temporarily rejected by local_scan(): Temporary local problem
@@ -150,7 +150,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: crash
I Message-Id: <E10HmaY-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
1999-03-02 09:44:33 10HmaY-0005vi-00 local_scan() function crashed with signal 11 - message temporarily rejected (size 35)
Envelope-from: <test-local-scan@y>
@@ -160,7 +160,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: crash
I Message-Id: <E10HmaY-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
local-scan-seen: yes
local-scan-body-start: Testing, testing
Index: 571
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/571,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 571 19 Nov 2004 15:18:57 -0000 1.4
+++ 571 17 May 2005 15:00:05 -0000 1.5
@@ -216,6 +216,39 @@
killdaemon
****
0
+sleep 1
+****
+0
+exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX 1225
+****
+0
+sleep 1
+****
+0
+client 127.0.0.1 1225
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<a@y>
+??? 250
+rcpt to:<x@y>
+??? 250
+data
+??? 354
+Sender: sender@???
+.
+??? 250
+quit
+??? 221
+****
+0
+killdaemon
+****
+0
catwrite /dev/null
****
0
@@ -280,5 +313,11 @@
****
0
exim -Mvh $msg11
+****
+0
+catwrite /dev/null
+****
+0
+exim -Mvh $msg12
****
no_msglog_check
Index: server.c
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/src/server.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server.c 8 Oct 2004 14:50:08 -0000 1.1
+++ server.c 17 May 2005 15:00:05 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-test-orig/AutoTest/src/server.c,v 1.1 2004/10/08 14:50:08 ph10 Exp $ */
+/* $Cambridge: exim/exim-test-orig/AutoTest/src/server.c,v 1.2 2005/05/17 15:00:05 ph10 Exp $ */
/* A little hacked up program that listens on a given port and allows a script
to play the part of a remote MTA for testing purposes. This scripted version is
@@ -16,6 +16,10 @@
#define LINUX_IP_OPTIONS
+/* To use poll() while sleeping, set this define. */
+
+/* #define USE_POLL */
+
/* ANSI C standard includes */
@@ -53,6 +57,10 @@
#include <unistd.h>
#include <utime.h>
+#ifdef USE_POLL
+#include <sys/poll.h>
+#endif
+
#ifdef AF_INET6
#define HAVE_IPV6 1
#endif
@@ -142,6 +150,7 @@
int count;
int on = 1;
int timeout = 5;
+int use_poll = 0;
int na = 1;
line *script = NULL;
line *last = NULL;
@@ -172,6 +181,12 @@
timeout = atoi(argv[2]);
na = 3;
}
+
+if (argc >= na + 1 && strcmp(argv[na], "-poll") == 0)
+ {
+ use_poll = 1;
+ na++;
+ }
if (argc < na + 1 )
{
@@ -403,13 +418,40 @@
}
/* If the script line starts with "*sleep" we just sleep for a while
- before continuing. */
+ before continuing. If USE_POLL is defined and use_poll is set, use poll()
+ to try to detect a disappearing connection. I have not been able to get
+ this to work at all. (So normally it isn't compiled.) */
else if (strncmp(ss, "*sleep ", 7) == 0)
{
+ int sleepfor = atoi(ss+7);
+
printf("%s\n", ss);
fflush(out);
- sleep(atoi(ss+7));
+
+ /* -------------------------------------------------------- */
+ #ifdef USE_POLL
+ if (use_poll)
+ {
+ while (sleepfor-- > 0)
+ {
+ struct pollfd pfd;
+ sleep(1);
+
+ pfd.fd = fileno(in);
+ pfd.events = POLLIN;
+
+ (void) poll(&pfd, 1, 0);
+
+ printf("revents=0x%.04x\n", pfd.revents);
+ }
+ }
+ else sleep(sleepfor);
+ /* -------------------------------------------------------- */
+
+ #else
+ sleep(sleepfor);
+ #endif
}
/* Otherwise the script line is the start of an input line we are expecting
Index: 335
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/335,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335 6 Apr 2005 10:06:14 -0000 1.2
+++ 335 17 May 2005 15:00:05 -0000 1.3
@@ -34,7 +34,7 @@
>>Headers after rewriting and local additions:
I Message-Id: <E10HmbX-0005vi-00@???>
-F From: test-local-scan@y
+F From: Philip Hazel <test-local-scan@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Data file written for message 10HmbX-0005vi-00
@@ -46,9 +46,9 @@
local_scan() called: message_id=10HmbX-0005vi-00
local_scan() returned 0 NULL
Writing spool header file
-Size of headers = 268
+Size of headers = 283
LOG: MAIN
- <= test-local-scan@y U=ph10 P=local-smtp S=269
+ <= test-local-scan@y U=ph10 P=local-smtp S=284
SMTP>> 250 OK id=10HmbX-0005vi-00
Exim version x.yz uid=42 gid=42 pid=pppp D=200001
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
@@ -94,7 +94,7 @@
LOG: PANIC
test write to LOG_PANIC
LOG: MAIN
- <= test-local-scan@y U=ph10 P=local-smtp S=269
+ <= test-local-scan@y U=ph10 P=local-smtp S=284
Exim version x.yz uid=42 gid=42 pid=pppp D=3
Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
Fixed never_users: 0
Index: 341
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/341,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 341 8 Oct 2004 14:50:08 -0000 1.1
+++ 341 17 May 2005 15:00:05 -0000 1.2
@@ -1,14 +1,14 @@
LOG: smtp_connection MAIN
SMTP connection from ph10
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=227
+ <= x@y U=ph10 P=local-smtp S=242
delivering 10HmaX-0005vi-00
LOG: MAIN
=> one <one@z> R=r1 T=t1
LOG: MAIN
Completed
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=227
+ <= x@y U=ph10 P=local-smtp S=242
LOG: delay_delivery MAIN
no immediate delivery: more than 1 messages received in one connection
LOG: MAIN REJECT
Index: 342
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/342,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 342 6 Apr 2005 10:06:14 -0000 1.2
+++ 342 17 May 2005 15:00:05 -0000 1.3
@@ -34,7 +34,7 @@
>>Headers after rewriting and local additions:
I Message-Id: <E10HmaX-0005vi-00@???>
-F From: x@y
+F From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Data file written for message 10HmaX-0005vi-00
@@ -44,9 +44,9 @@
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
-Size of headers = 215
+Size of headers = 230
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=216
+ <= x@y U=ph10 P=local-smtp S=231
created log directory /source/exim4/AutoTest/spool/log
SMTP>> 250 OK id=10HmaX-0005vi-00
smtp_setup_msg entered
@@ -61,7 +61,7 @@
>>Headers after rewriting and local additions:
I Message-Id: <E10HmaY-0005vi-00@???>
-F From: x@y
+F From: Philip Hazel <x@y>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Data file written for message 10HmaY-0005vi-00
@@ -72,9 +72,9 @@
calling local_scan(); timeout=300
local_scan() returned 0 NULL
Writing spool header file
-Size of headers = 226
+Size of headers = 241
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=227
+ <= x@y U=ph10 P=local-smtp S=242
SMTP>> 250 OK id=10HmaY-0005vi-00
smtp_setup_msg entered
SMTP<< mail from:<x@y>
Index: 335
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/335,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 335 8 Oct 2004 14:50:13 -0000 1.1
+++ 335 17 May 2005 15:00:05 -0000 1.2
@@ -130,10 +130,10 @@
354 Enter message, ending with "." on a line by itself
250 OK id=10HmcB-0005vi-00
221 myhost.test.ex closing connection
- 0m 352 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+ 0m 367 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
ph10@???
- 0m 351 10HmcB-0005vi-00 <test-local-scan@y>
+ 0m 366 10HmcB-0005vi-00 <test-local-scan@y>
ph10@???
@@ -179,13 +179,13 @@
354 Enter message, ending with "." on a line by itself
250 OK id=10HmcC-0005vi-00
221 myhost.test.ex closing connection
- 0m 352 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+ 0m 367 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
ph10@???
- 0m 351 10HmcB-0005vi-00 <test-local-scan@y>
+ 0m 366 10HmcB-0005vi-00 <test-local-scan@y>
ph10@???
- 0m 414 10HmcC-0005vi-00 <test-local-scan@y>
+ 0m 429 10HmcC-0005vi-00 <test-local-scan@y>
unqualified@???
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
Index: 571
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/571,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 571 19 Oct 2004 11:04:26 -0000 1.2
+++ 571 17 May 2005 15:00:05 -0000 1.3
@@ -236,6 +236,37 @@
??? 221
<<< 221 myhost.test.ex closing connection
End of script
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello ph10 at rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-AUTH PLAIN
+??? 250
+<<< 250 HELP
+>>> mail from:<a@y>
+??? 250
+<<< 250 OK
+>>> rcpt to:<x@y>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Sender: sender@???
+>>> .
+??? 250
+<<< 250 OK id=10HmbI-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
==========
==========
10HmaX-0005vi-00-H
@@ -355,7 +386,7 @@
==========
10HmbC-0005vi-00-H
ph10 1169 1169
-<a@y>
+<username@???>
ddddddddd 0
-helo_name rhu.barb
-host_address 127.0.0.1.9999
@@ -507,4 +538,29 @@
026S Sender: sender@???
047I Message-Id: <E10HmbH-0005vi-00@???>
010F From: a@y
+038 Date: Tue, 2 Mar 1999 09:44:33 +0000
+==========
+==========
+10HmbI-0005vi-00-H
+ph10 1169 1169
+<a@y>
+ddddddddd 0
+-helo_name rhu.barb
+-host_address 127.0.0.1.9999
+-interface_address 127.0.0.1.1225
+-ident ph10
+-received_protocol esmtp
+-body_linecount 0
+-deliver_firsttime
+XX
+1
+x@y
+
+159P Received: from [127.0.0.1] (helo=rhu.barb ident=ph10)
+ by myhost.test.ex with esmtp (Exim x.yz)
+ id 10HmbI-0005vi-00
+ for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+026* Sender: sender@???
+047I Message-Id: <E10HmbI-0005vi-00@???>
+021F From: SomeName <a@y>
038 Date: Tue, 2 Mar 1999 09:44:33 +0000
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/578,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 578 8 Oct 2004 14:50:14 -0000 1.1
+++ 578 17 May 2005 15:00:05 -0000 1.2
@@ -138,7 +138,7 @@
by myhost.test.ex with local-esmtp (Exim x.yz)
id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbI-0005vi-00@???>
-From: sen@der
+From: Philip Hazel <sen@der>
Date: Tue, 2 Mar 1999 09:44:33 +0000
This should succeed.
