ph10 2005/09/07 11:15:34 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src acl.c exim.c globals.c globals.h
receive.c smtp_in.c
exim-test-orig/AutoTest/log 005 028 061 133 206 207 324 335
341 342 522 578 585
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/stderr 335 341 342
exim-test-orig/AutoTest/stdout 335 542 578
Log:
Fix incorrect use of local user name for trusted submissions.
Revision Changes Path
1.217 +8 -0 exim/exim-doc/doc-txt/ChangeLog
1.46 +1 -1 exim/exim-src/src/acl.c
1.27 +1 -0 exim/exim-src/src/exim.c
1.35 +2 -0 exim/exim-src/src/globals.c
1.27 +2 -0 exim/exim-src/src/globals.h
1.23 +31 -7 exim/exim-src/src/receive.c
1.24 +1 -0 exim/exim-src/src/smtp_in.c
1.4 +3 -3 exim/exim-test-orig/AutoTest/log/005
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/028
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/061
1.5 +6 -6 exim/exim-test-orig/AutoTest/log/133
1.4 +1 -1 exim/exim-test-orig/AutoTest/log/206
1.4 +2 -2 exim/exim-test-orig/AutoTest/log/207
1.3 +3 -3 exim/exim-test-orig/AutoTest/log/324
1.4 +24 -24 exim/exim-test-orig/AutoTest/log/335
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/341
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/342
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/522
1.6 +2 -2 exim/exim-test-orig/AutoTest/log/578
1.5 +1 -1 exim/exim-test-orig/AutoTest/log/585
1.4 +3 -3 exim/exim-test-orig/AutoTest/mail/005.ph10
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/028.ph10
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/061.ph10
1.4 +2 -2 exim/exim-test-orig/AutoTest/mail/133.forwarder
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/206.copies
1.3 +2 -2 exim/exim-test-orig/AutoTest/mail/324.ph10
1.4 +1 -1 exim/exim-test-orig/AutoTest/mail/335.exbounce
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/335.mug99
1.3 +13 -13 exim/exim-test-orig/AutoTest/mail/335.ph10
1.3 +1 -1 exim/exim-test-orig/AutoTest/mail/335.unqualified
1.4 +1 -1 exim/exim-test-orig/AutoTest/mail/585.ph10
1.4 +1 -1 exim/exim-test-orig/AutoTest/msglog/206.10HmaY-0005vi-00
1.3 +1 -1 exim/exim-test-orig/AutoTest/msglog/207.10HmbA-0005vi-00
1.3 +1 -1 exim/exim-test-orig/AutoTest/msglog/207.10HmbC-0005vi-00
1.3 +1 -1 exim/exim-test-orig/AutoTest/rejectlog/324
1.3 +10 -10 exim/exim-test-orig/AutoTest/rejectlog/335
1.5 +4 -4 exim/exim-test-orig/AutoTest/stderr/335
1.3 +2 -2 exim/exim-test-orig/AutoTest/stderr/341
1.5 +6 -6 exim/exim-test-orig/AutoTest/stderr/342
1.3 +5 -5 exim/exim-test-orig/AutoTest/stdout/335
1.2 +4 -2 exim/exim-test-orig/AutoTest/stdout/542
1.4 +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.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog 6 Sep 2005 13:21:06 -0000 1.216
+++ ChangeLog 7 Sep 2005 10:15:33 -0000 1.217
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.216 2005/09/06 13:21:06 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.217 2005/09/07 10:15:33 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -143,6 +143,14 @@
settings.
PH/35 Installed configuration files for Dragonfly.
+
+PH/36 When a locally submitted message by a trusted user did not contain a
+ From: header, and the sender address was obtained from -f or from an SMTP
+ MAIL command, and the trusted user did not use -F to supply a sender
+ name, $originator_name was incorrectly used when constructing a From:
+ header. Furthermore, $originator_name was used for submission mode
+ messages from external hosts without From: headers in a similar way,
+ which is clearly wrong.
Exim version 4.52
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- acl.c 6 Sep 2005 13:17:36 -0000 1.45
+++ acl.c 7 Sep 2005 10:15:33 -0000 1.46
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.45 2005/09/06 13:17:36 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.46 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2494,7 +2494,7 @@
{
uschar *pp = p + 6;
while (*pp != 0 && *pp != '/') pp++;
- originator_name = string_copy(parse_fix_phrase(p+6, pp-p-6,
+ submission_name = string_copy(parse_fix_phrase(p+6, pp-p-6,
big_buffer, big_buffer_size));
p = pp;
}
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- exim.c 23 Aug 2005 11:25:38 -0000 1.26
+++ exim.c 7 Sep 2005 10:15:33 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.26 2005/08/23 11:25:38 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim.c,v 1.27 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1993,6 +1993,7 @@
{ badarg = TRUE; break; }
}
originator_name = argrest;
+ sender_name_forced = TRUE;
break;
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- globals.c 8 Aug 2005 10:48:27 -0000 1.34
+++ globals.c 7 Sep 2005 10:15:33 -0000 1.35
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.34 2005/08/08 10:48:27 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.35 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -982,6 +982,7 @@
BOOL sender_host_unknown = FALSE;
uschar *sender_ident = NULL;
BOOL sender_local = FALSE;
+BOOL sender_name_forced = FALSE;
uschar *sender_rate = NULL;
uschar *sender_rate_limit = NULL;
uschar *sender_rate_period = NULL;
@@ -1081,6 +1082,7 @@
BOOL strip_trailing_dot = FALSE;
uschar *submission_domain = NULL;
BOOL submission_mode = FALSE;
+uschar *submission_name = NULL;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- globals.h 22 Aug 2005 14:01:37 -0000 1.26
+++ globals.h 7 Sep 2005 10:15:33 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.26 2005/08/22 14:01:37 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.h,v 1.27 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -593,6 +593,7 @@
extern BOOL sender_host_unknown; /* TRUE for -bs and -bS except inetd */
extern uschar *sender_ident; /* Sender identity via RFC 1413 */
extern BOOL sender_local; /* TRUE for local senders */
+extern BOOL sender_name_forced; /* Set by -F */
extern uschar *sender_rate; /* Sender rate computed by ACL */
extern uschar *sender_rate_limit; /* Configured rate limit */
extern uschar *sender_rate_period; /* Configured smoothing period */
@@ -684,6 +685,7 @@
extern BOOL strip_trailing_dot; /* Remove dots at ends of domains */
extern uschar *submission_domain; /* Domain for submission mode */
extern BOOL submission_mode; /* Can be forced from ACL */
+extern uschar *submission_name; /* User name set from ACL */
extern BOOL synchronous_delivery; /* TRUE if -odi is set */
extern BOOL syslog_duplication; /* FALSE => no duplicate logging */
extern int syslog_facility; /* As defined by Syslog.h */
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- receive.c 1 Aug 2005 14:41:25 -0000 1.22
+++ receive.c 7 Sep 2005 10:15:33 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.22 2005/08/01 14:41:25 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/receive.c,v 1.23 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2338,6 +2338,28 @@
if (from_header == NULL && (sender_host_address == NULL || submission_mode))
{
+ uschar *oname = US"";
+
+ /* Use the originator_name if this is a locally submitted message and the
+ caller is not trusted. For trusted callers, use it only if -F was used to
+ force its value or if we have a non-SMTP message for which -f was not used
+ to set the sender. */
+
+ if (sender_host_address == NULL)
+ {
+ if (!trusted_caller || sender_name_forced ||
+ (!smtp_input && !sender_address_forced))
+ oname = originator_name;
+ }
+
+ /* For non-locally submitted messages, the only time we use the originator
+ name is when it was forced by the /name= option on control=submission. */
+
+ else
+ {
+ if (submission_name != NULL) oname = submission_name;
+ }
+
/* Envelope sender is empty */
if (sender_address[0] == 0)
@@ -2345,8 +2367,8 @@
uschar *fromstart, *fromend;
fromstart = string_sprintf("%sFrom: %s%s", resent_prefix,
- originator_name, (originator_name[0] == 0)? "" : " <");
- fromend = (originator_name[0] == 0)? US"" : US">";
+ oname, (oname[0] == 0)? "" : " <");
+ fromend = (oname[0] == 0)? US"" : US">";
if (sender_local || local_error_message)
{
@@ -2384,11 +2406,11 @@
else
{
header_add(htype_from, "%sFrom: %s%s%s%s\n", resent_prefix,
- originator_name,
- (originator_name[0] == 0)? "" : " <",
+ oname,
+ (oname[0] == 0)? "" : " <",
(sender_address_unrewritten == NULL)?
sender_address : sender_address_unrewritten,
- (originator_name[0] == 0)? "" : ">");
+ (oname[0] == 0)? "" : ">");
from_header = header_last; /* To get it checked for Sender: */
}
@@ -2469,12 +2491,14 @@
if (make_sender)
{
- if (submission_mode && originator_name[0] == 0)
+ if (submission_mode && submission_name == NULL)
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);
+ resent_prefix,
+ submission_mode? submission_name : originator_name,
+ generated_sender_address);
}
/* Ensure that a non-null envelope sender address corresponds to the
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- smtp_in.c 22 Aug 2005 14:01:37 -0000 1.23
+++ smtp_in.c 7 Sep 2005 10:15:33 -0000 1.24
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.23 2005/08/22 14:01:37 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.24 2005/09/07 10:15:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -815,6 +815,7 @@
active_local_from_check = local_from_check; /* Can be set by ACL */
active_local_sender_retain = local_sender_retain; /* Can be set by ACL */
sender_address = NULL;
+submission_name = NULL; /* Can be set by ACL */
raw_sender = NULL; /* After SMTP rewrite, before qualifying */
sender_address_unrewritten = NULL; /* Set only after verify rewrite */
sender_verified_list = NULL; /* No senders verified */
Index: 005
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/005,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 005 17 May 2005 15:00:04 -0000 1.3
+++ 005 7 Sep 2005 10:15:33 -0000 1.4
@@ -1,9 +1,9 @@
-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@??? U=ph10 P=local-smtp S=366
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=361
+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 <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=379
+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 <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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 028 17 May 2005 15:00:04 -0000 1.2
+++ 028 7 Sep 2005 10:15:33 -0000 1.3
@@ -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=328
+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 <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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 061 17 May 2005 15:00:04 -0000 1.2
+++ 061 7 Sep 2005 10:15:33 -0000 1.3
@@ -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=331
+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 => 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 133 29 Jun 2005 14:17:02 -0000 1.4
+++ 133 7 Sep 2005 10:15:33 -0000 1.5
@@ -1,24 +1,24 @@
-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 <= abcd@??? U=ph10 P=local-smtp S=249
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=1047
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=1032
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=1051
+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 => 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=294
+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 == 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=1016
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=exim P=local S=1001
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=1020
+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 => 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 206 9 Aug 2005 13:31:53 -0000 1.3
+++ 206 7 Sep 2005 10:15:33 -0000 1.4
@@ -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=264
+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 => 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 207 9 Aug 2005 13:31:53 -0000 1.3
+++ 207 7 Sep 2005 10:15:33 -0000 1.4
@@ -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=389 id=E10HmbB-0005vi-00@???
+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 ** 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=1188
+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 == 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 324 17 May 2005 15:00:04 -0000 1.2
+++ 324 7 Sep 2005 10:15:33 -0000 1.3
@@ -1,12 +1,12 @@
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=ph10 P=local-smtp S=284
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=ph10 P=local-smtp S=269
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=293
+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 => 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=352
+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 => 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 335 17 May 2005 15:00:04 -0000 1.3
+++ 335 7 Sep 2005 10:15:33 -0000 1.4
@@ -1,7 +1,7 @@
-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 <= x@y U=ph10 P=local-smtp S=251
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=301
+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 => 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=360
+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 => 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=403
+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 => 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=419
+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 => 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=377
+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 => 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=475
+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 ** bounce@??? R=r0: bounced (:fail:)
-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 <= <> R=10HmbU-0005vi-00 U=exim P=local S=1205
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=422
+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 => 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=284
+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 *> 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=284
+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 *> 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=390
+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 => 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=383
+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 => 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=367
+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 frozen by local_scan()
-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 <= test-local-scan@y U=ph10 P=local-smtp S=351
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=429
+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 => 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=446
+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 => 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=379
+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 => 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=414
+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 => 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=414
+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 => 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=410
+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 => 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=415
+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 => 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=389
+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 => 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=390
+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 => 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 341 17 May 2005 15:00:04 -0000 1.2
+++ 341 7 Sep 2005 10:15:33 -0000 1.3
@@ -1,7 +1,7 @@
-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 <= x@y U=ph10 P=local-smtp S=227
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=242
+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 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 342 17 May 2005 15:00:04 -0000 1.2
+++ 342 7 Sep 2005 10:15:33 -0000 1.3
@@ -1,5 +1,5 @@
-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 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 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 522 17 May 2005 15:00:04 -0000 1.2
+++ 522 7 Sep 2005 10:15:33 -0000 1.3
@@ -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=286
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> U=ph10 P=local-esmtp S=271
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 578 9 Aug 2005 13:31:53 -0000 1.5
+++ 578 7 Sep 2005 10:15:33 -0000 1.6
@@ -40,11 +40,11 @@
1999-03-02 09:44:33 10HmbI-0005vi-00 ** mua_wrapper is set but recipients cannot all be delivered in one transaction
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
1999-03-02 09:44:33 Daemon cannot be run when mua_wrapper is set
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=269
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=254
1999-03-02 09:44:33 10HmbJ-0005vi-00 => a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbJ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=285
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=ph10 P=local-esmtp S=270
1999-03-02 09:44:33 10HmbK-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
1999-03-02 09:44:33 10HmbK-0005vi-00 ::1 [::1] Connection refused
1999-03-02 09:44:33 10HmbK-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 585 17 May 2005 15:00:04 -0000 1.4
+++ 585 7 Sep 2005 10:15:33 -0000 1.5
@@ -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=312
+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 => ph10 <ph10@y> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 005.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/005.ph10,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 005.ph10 17 May 2005 15:00:04 -0000 1.3
+++ 005.ph10 7 Sep 2005 10:15:34 -0000 1.4
@@ -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: Philip Hazel <ph10@???>
+From: 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: Philip Hazel <ph10@???>
+From: 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: Philip Hazel <ph10@???>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 028.ph10 17 May 2005 15:00:04 -0000 1.2
+++ 028.ph10 7 Sep 2005 10:15:34 -0000 1.3
@@ -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: Philip Hazel <ph10@???>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 061.ph10 17 May 2005 15:00:04 -0000 1.2
+++ 061.ph10 7 Sep 2005 10:15:34 -0000 1.3
@@ -32,7 +32,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
sysmail: yes
Message-Id: <E10HmaZ-0005vi-00@???>
-From: Philip Hazel <postmaster@???>
+From: 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 133.forwarder 17 May 2005 15:00:04 -0000 1.3
+++ 133.forwarder 7 Sep 2005 10:15:34 -0000 1.4
@@ -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: Philip Hazel <abcd@???>
+From: 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: Philip Hazel <abcd@???>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 206.copies 17 May 2005 15:00:04 -0000 1.2
+++ 206.copies 7 Sep 2005 10:15:34 -0000 1.3
@@ -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: Philip Hazel <doesn't@matter>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 324.ph10 17 May 2005 15:00:04 -0000 1.2
+++ 324.ph10 7 Sep 2005 10:15:34 -0000 1.3
@@ -3,7 +3,7 @@
id 10HmbD-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbD-0005vi-00@???>
-From: Philip Hazel <x@y>
+From: 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: Philip Hazel <x@y>
+From: 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 335.exbounce 17 May 2005 15:00:04 -0000 1.3
+++ 335.exbounce 7 Sep 2005 10:15:34 -0000 1.4
@@ -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: Philip Hazel <test-local-scan@y>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335.mug99 17 May 2005 15:00:04 -0000 1.2
+++ 335.mug99 7 Sep 2005 10:15:34 -0000 1.3
@@ -4,7 +4,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: sendto mug99@???
Message-Id: <E10HmbP-0005vi-00@???>
-From: Philip Hazel <test-local-scan@y>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335.ph10 17 May 2005 15:00:04 -0000 1.2
+++ 335.ph10 7 Sep 2005 10:15:34 -0000 1.3
@@ -3,7 +3,7 @@
id 10HmbM-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbM-0005vi-00@???>
-From: Philip Hazel <x@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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: Philip Hazel <test-local-scan@y>
+From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335.unqualified 17 May 2005 15:00:04 -0000 1.2
+++ 335.unqualified 7 Sep 2005 10:15:34 -0000 1.3
@@ -4,7 +4,7 @@
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
local-scan: sendto unqualified
Message-Id: <E10HmcC-0005vi-00@???>
-From: Philip Hazel <test-local-scan@y>
+From: 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 585.ph10 17 May 2005 15:00:04 -0000 1.3
+++ 585.ph10 7 Sep 2005 10:15:34 -0000 1.4
@@ -4,7 +4,7 @@
for ph10@y; Tue, 2 Mar 1999 09:44:33 +0000
Subject: testing
Message-Id: <E10HmaX-0005vi-00@???>
-From: Philip Hazel <postmaster@y>
+From: 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 206.10HmaY-0005vi-00 9 Aug 2005 13:31:53 -0000 1.3
+++ 206.10HmaY-0005vi-00 7 Sep 2005 10:15:34 -0000 1.4
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-smtp S=264
+1999-03-02 09:44:33 Received from doesn't@matter U=ph10 P=local-smtp S=249
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 207.10HmbA-0005vi-00 17 May 2005 15:00:05 -0000 1.2
+++ 207.10HmbA-0005vi-00 7 Sep 2005 10:15:34 -0000 1.3
@@ -1,3 +1,3 @@
-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 Received from doesn't@matter U=ph10 P=local-bsmtp S=374 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 207.10HmbC-0005vi-00 17 May 2005 15:00:05 -0000 1.2
+++ 207.10HmbC-0005vi-00 7 Sep 2005 10:15:34 -0000 1.3
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=exim P=local S=1188
+1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=exim P=local S=1173
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 324 17 May 2005 15:00:05 -0000 1.2
+++ 324 7 Sep 2005 10:15:34 -0000 1.3
@@ -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: Philip Hazel <x@y>
+F From: 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335 17 May 2005 15:00:05 -0000 1.2
+++ 335 7 Sep 2005 10:15:34 -0000 1.3
@@ -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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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: Philip Hazel <test-local-scan@y>
+F From: 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
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/335,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 335 1 Aug 2005 13:20:29 -0000 1.4
+++ 335 7 Sep 2005 10:15:34 -0000 1.5
@@ -34,7 +34,7 @@
>>Headers after rewriting and local additions:
I Message-Id: <E10HmbX-0005vi-00@???>
-F From: Philip Hazel <test-local-scan@y>
+F From: 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 = 283
+Size of headers = 268
LOG: MAIN
- <= test-local-scan@y U=ph10 P=local-smtp S=284
+ <= test-local-scan@y U=ph10 P=local-smtp S=269
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 sqlite testdb
@@ -94,7 +94,7 @@
LOG: PANIC
test write to LOG_PANIC
LOG: MAIN
- <= test-local-scan@y U=ph10 P=local-smtp S=284
+ <= test-local-scan@y U=ph10 P=local-smtp S=269
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 sqlite testdb
Fixed never_users: 0
Index: 341
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/341,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 341 17 May 2005 15:00:05 -0000 1.2
+++ 341 7 Sep 2005 10:15:34 -0000 1.3
@@ -1,14 +1,14 @@
LOG: smtp_connection MAIN
SMTP connection from ph10
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=242
+ <= x@y U=ph10 P=local-smtp S=227
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=242
+ <= x@y U=ph10 P=local-smtp S=227
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 342 1 Aug 2005 13:20:29 -0000 1.4
+++ 342 7 Sep 2005 10:15:34 -0000 1.5
@@ -34,7 +34,7 @@
>>Headers after rewriting and local additions:
I Message-Id: <E10HmaX-0005vi-00@???>
-F From: Philip Hazel <x@y>
+F From: 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 = 230
+Size of headers = 215
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=231
+ <= x@y U=ph10 P=local-smtp S=216
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: Philip Hazel <x@y>
+F From: 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 = 241
+Size of headers = 226
LOG: MAIN
- <= x@y U=ph10 P=local-smtp S=242
+ <= x@y U=ph10 P=local-smtp S=227
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 335 17 May 2005 15:00:05 -0000 1.2
+++ 335 7 Sep 2005 10:15:34 -0000 1.3
@@ -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 367 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+ 0m 352 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
ph10@???
- 0m 366 10HmcB-0005vi-00 <test-local-scan@y>
+ 0m 351 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 367 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
+ 0m 352 10HmcA-0005vi-00 <test-local-scan@y> *** frozen ***
ph10@???
- 0m 366 10HmcB-0005vi-00 <test-local-scan@y>
+ 0m 351 10HmcB-0005vi-00 <test-local-scan@y>
ph10@???
- 0m 429 10HmcC-0005vi-00 <test-local-scan@y>
+ 0m 414 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: 542
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/542,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 542 8 Oct 2004 14:50:14 -0000 1.1
+++ 542 7 Sep 2005 10:15:34 -0000 1.2
@@ -4,9 +4,11 @@
> dbm: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
>
Overlong line read: max permitted length is 19999
-exim_dbmbuild exit code = 1
+dbmbuild abandoned
+exim_dbmbuild exit code = 2
Continued set of lines is too long: max permitted length is 99999
-exim_dbmbuild exit code = 1
+dbmbuild abandoned
+exim_dbmbuild exit code = 2
5 entries written
exim_dbmbuild exit code = 0
> [abc]
Index: 578
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/578,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 578 28 Jun 2005 10:23:36 -0000 1.3
+++ 578 7 Sep 2005 10:15:34 -0000 1.4
@@ -138,7 +138,7 @@
by myhost.test.ex with local-esmtp (Exim x.yz)
id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
Message-Id: <E10HmbJ-0005vi-00@???>
-From: Philip Hazel <sen@der>
+From: sen@der
Date: Tue, 2 Mar 1999 09:44:33 +0000
This should succeed.
