ph10 2007/06/22 15:38:59 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/exim_monitor em_globals.c
exim-src/src expand.c globals.c globals.h receive.c
spool_in.c spool_out.c
exim-test/scripts/0000-Basic 0542
exim-test/stdout 0035 0245 0250 0254 0311 0338 0377 0378
0379 0389 0488 0490 0514 0542 3415
Log:
Added $max_received_linelength.
Revision Changes Path
1.517 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.152 +4 -0 exim/exim-doc/doc-txt/NewStuff
1.12 +1 -0 exim/exim-src/exim_monitor/em_globals.c
1.87 +1 -0 exim/exim-src/src/expand.c
1.75 +1 -0 exim/exim-src/src/globals.c
1.55 +1 -0 exim/exim-src/src/globals.h
1.38 +42 -6 exim/exim-src/src/receive.c
1.20 +3 -0 exim/exim-src/src/spool_in.c
1.14 +1 -0 exim/exim-src/src/spool_out.c
1.4 +3 -1 exim/exim-test/scripts/0000-Basic/0542
1.3 +7 -0 exim/exim-test/stdout/0035
1.2 +1 -0 exim/exim-test/stdout/0245
1.2 +3 -0 exim/exim-test/stdout/0250
1.2 +3 -0 exim/exim-test/stdout/0254
1.2 +2 -0 exim/exim-test/stdout/0311
1.2 +1 -0 exim/exim-test/stdout/0338
1.2 +1 -0 exim/exim-test/stdout/0377
1.2 +1 -0 exim/exim-test/stdout/0378
1.2 +1 -0 exim/exim-test/stdout/0379
1.2 +1 -0 exim/exim-test/stdout/0389
1.2 +1 -0 exim/exim-test/stdout/0488
1.2 +1 -0 exim/exim-test/stdout/0490
1.2 +1 -0 exim/exim-test/stdout/0514
1.5 +4 -2 exim/exim-test/stdout/0542
1.3 +5 -0 exim/exim-test/stdout/3415
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- ChangeLog 20 Jun 2007 14:13:39 -0000 1.516
+++ ChangeLog 22 Jun 2007 14:38:58 -0000 1.517
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.516 2007/06/20 14:13:39 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.517 2007/06/22 14:38:58 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -66,6 +66,8 @@
(without spaces) instead of just copying the configuration text.
PH/10 Added the /noupdate option to the ratelimit ACL condition.
+
+PH/11 Added $max_received_linelength.
Exim version 4.67
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- NewStuff 20 Jun 2007 14:13:39 -0000 1.151
+++ NewStuff 22 Jun 2007 14:38:58 -0000 1.152
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.151 2007/06/20 14:13:39 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.152 2007/06/22 14:38:58 ph10 Exp $
New Features in Exim
--------------------
@@ -73,6 +73,10 @@
condition = ${if le{$sender_rate}{$sender_rate_limit}}
accept
+
+ 6. The variable $max_received_linelength contains the number of bytes in the
+ longest line that was received as part of the message, not counting the
+ line termination character(s).
Version 4.67
Index: em_globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/exim_monitor/em_globals.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- em_globals.c 8 Jan 2007 10:50:17 -0000 1.11
+++ em_globals.c 22 Jun 2007 14:38:58 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.11 2007/01/08 10:50:17 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/exim_monitor/em_globals.c,v 1.12 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim Monitor *
@@ -163,6 +163,7 @@
uschar *spam_score_int = NULL;
#endif
+int max_received_linelength= 0;
int message_age = 0;
uschar *message_id;
uschar *message_id_external;
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- expand.c 14 Jun 2007 14:18:19 -0000 1.86
+++ expand.c 22 Jun 2007 14:38:58 -0000 1.87
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.86 2007/06/14 14:18:19 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.87 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -453,6 +453,7 @@
#ifdef WITH_CONTENT_SCAN
{ "malware_name", vtype_stringptr, &malware_name },
#endif
+ { "max_received_linelength", vtype_int, &max_received_linelength },
{ "message_age", vtype_int, &message_age },
{ "message_body", vtype_msgbody, &message_body },
{ "message_body_end", vtype_msgbody_end, &message_body_end },
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- globals.c 18 Jun 2007 13:57:50 -0000 1.74
+++ globals.c 22 Jun 2007 14:38:58 -0000 1.75
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.74 2007/06/18 13:57:50 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.75 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -743,6 +743,7 @@
#ifdef WITH_CONTENT_SCAN
uschar *malware_name = NULL; /* Virus Name */
#endif
+int max_received_linelength= 0;
int max_username_length = 0;
int message_age = 0;
uschar *message_body = NULL;
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- globals.h 14 Jun 2007 14:18:19 -0000 1.54
+++ globals.h 22 Jun 2007 14:38:58 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.54 2007/06/14 14:18:19 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.h,v 1.55 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -432,6 +432,7 @@
#ifdef WITH_CONTENT_SCAN
extern uschar *malware_name; /* Name of virus or malware ("W32/Klez-H") */
#endif
+extern int max_received_linelength;/* What it says */
extern int max_username_length; /* For systems with broken getpwnam() */
extern int message_age; /* In seconds */
extern uschar *message_body; /* Start of message body for filter */
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- receive.c 16 Apr 2007 10:31:58 -0000 1.37
+++ receive.c 22 Jun 2007 14:38:58 -0000 1.38
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.37 2007/04/16 10:31:58 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/receive.c,v 1.38 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -564,6 +564,7 @@
{
int ch_state;
register int ch;
+register int linelength = 0;
/* Handle the case when only EOF terminates the message */
@@ -576,6 +577,9 @@
if (ch == 0) body_zerocount++;
if (last_ch == '\r' && ch != '\n')
{
+ if (linelength > max_received_linelength)
+ max_received_linelength = linelength;
+ linelength = 0;
if (fputc('\n', fout) == EOF) return END_WERROR;
message_size++;
body_linecount++;
@@ -583,12 +587,21 @@
if (ch == '\r') continue;
if (fputc(ch, fout) == EOF) return END_WERROR;
- if (ch == '\n') body_linecount++;
+ if (ch == '\n')
+ {
+ if (linelength > max_received_linelength)
+ max_received_linelength = linelength;
+ linelength = 0;
+ body_linecount++;
+ }
+ else linelength++;
if (++message_size > thismessage_size_limit) return END_SIZE;
}
if (last_ch != '\n')
{
+ if (linelength > max_received_linelength)
+ max_received_linelength = linelength;
if (fputc('\n', fout) == EOF) return END_WERROR;
message_size++;
body_linecount++;
@@ -608,25 +621,37 @@
{
case 0: /* Normal state (previous char written) */
if (ch == '\n')
- { body_linecount++; ch_state = 1; }
+ {
+ body_linecount++;
+ if (linelength > max_received_linelength)
+ max_received_linelength = linelength;
+ linelength = -1;
+ ch_state = 1;
+ }
else if (ch == '\r')
{ ch_state = 2; continue; }
break;
case 1: /* After written "\n" */
if (ch == '.') { ch_state = 3; continue; }
- if (ch != '\n') ch_state = 0;
+ if (ch != '\n') ch_state = 0; else linelength = -1;
break;
case 2:
body_linecount++; /* After unwritten "\r" */
+ if (linelength > max_received_linelength)
+ max_received_linelength = linelength;
if (ch == '\n')
- { ch_state = 1; }
+ {
+ ch_state = 1;
+ linelength = -1;
+ }
else
{
if (message_size++, fputc('\n', fout) == EOF) return END_WERROR;
if (ch == '\r') continue;
ch_state = 0;
+ linelength = 0;
}
break;
@@ -634,6 +659,7 @@
if (ch == '\n') return END_DOT;
if (ch == '\r') { ch_state = 4; continue; }
message_size++;
+ linelength++;
if (fputc('.', fout) == EOF) return END_WERROR;
ch_state = 0;
break;
@@ -648,6 +674,7 @@
break;
}
+ linelength++;
if (fputc(ch, fout) == EOF) return END_WERROR;
if (++message_size > thismessage_size_limit) return END_SIZE;
}
@@ -1263,6 +1290,7 @@
int start, end, domain, size, sptr;
int id_resolution;
int had_zero = 0;
+int prevlines_length = 0;
register int ptr = 0;
@@ -1343,13 +1371,14 @@
spool_name[0] = 0;
message_size = 0;
warning_count = 0;
-received_count = 1; /* For the one we will add */
+received_count = 1; /* For the one we will add */
if (thismessage_size_limit <= 0) thismessage_size_limit = INT_MAX;
/* While reading the message, the following counts are computed. */
-message_linecount = body_linecount = body_zerocount = 0;
+message_linecount = body_linecount = body_zerocount =
+ max_received_linelength = 0;
#ifdef EXPERIMENTAL_DOMAINKEYS
/* Call into DK to set up the context. Check if DK is to be run are carried out
@@ -1585,6 +1614,12 @@
receive_linecount++;
message_linecount++;
+ /* Keep track of maximum line length */
+
+ if (ptr - prevlines_length > max_received_linelength)
+ max_received_linelength = ptr - prevlines_length;
+ prevlines_length = ptr + 1;
+
/* Now put in the terminating newline. There is always space for
at least two more characters. */
@@ -1813,6 +1848,7 @@
next->text = store_get(header_size);
ptr = 0;
had_zero = 0;
+ prevlines_length = 0;
} /* Continue, starting to read the next header */
/* At this point, we have read all the headers into a data structure in main
Index: spool_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- spool_in.c 8 Jan 2007 10:50:18 -0000 1.19
+++ spool_in.c 22 Jun 2007 14:38:58 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.19 2007/01/08 10:50:18 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.20 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -255,6 +255,7 @@
interface_port = 0;
local_error_message = FALSE;
local_scan_data = NULL;
+max_received_linelength = 0;
message_linecount = 0;
received_protocol = NULL;
received_count = 0;
@@ -518,6 +519,8 @@
case 'm':
if (Ustrcmp(p, "anual_thaw") == 0) deliver_manual_thaw = TRUE;
+ else if (Ustrncmp(p, "ax_received_linelength", 22) == 0)
+ max_received_linelength = Uatoi(big_buffer + 24);
break;
case 'N':
Index: spool_out.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_out.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- spool_out.c 22 Jan 2007 16:29:54 -0000 1.13
+++ spool_out.c 22 Jun 2007 14:38:58 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.13 2007/01/22 16:29:54 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.14 2007/06/22 14:38:58 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -198,6 +198,7 @@
/* Now any other data that needs to be remembered. */
fprintf(f, "-body_linecount %d\n", body_linecount);
+fprintf(f, "-max_received_linelength %d\n", max_received_linelength);
if (body_zerocount > 0) fprintf(f, "-body_zerocount %d\n", body_zerocount);
Index: 0542
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0542,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0542 19 Dec 2006 16:40:27 -0000 1.3
+++ 0542 22 Jun 2007 14:38:58 -0000 1.4
@@ -4,7 +4,7 @@
To: Yourself <you@???>
Subject: The subject is not the object
-This is the body of the message.
+This is the body of the message. Make the line longer than any header.
****
sudo exim -be -Mset $msg1
From: $h_from:
@@ -13,6 +13,7 @@
message_size=$message_size
message_id=$message_id
message_exim_id=$message_exim_id
+max_received_linelength=$max_received_linelength
recipients=$recipients
****
write test-data
@@ -32,6 +33,7 @@
message_exim_id=$message_exim_id
message_linecount=$message_linecount
message_body_linecount=$body_linecount
+max_received_linelength=$max_received_linelength
headers -----------------
$message_headers
Index: 0035
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0035,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0035 14 Mar 2007 12:15:56 -0000 1.2
+++ 0035 22 Jun 2007 14:38:58 -0000 1.3
@@ -143,6 +143,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 0
-deliver_firsttime
XX
1
@@ -162,6 +163,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 0
-deliver_firsttime
XX
1
@@ -184,6 +186,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 0
-deliver_firsttime
XX
1
@@ -204,6 +207,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 25
-deliver_firsttime
XX
1
@@ -224,6 +228,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 25
-deliver_firsttime
XX
1
@@ -247,6 +252,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 25
-deliver_firsttime
XX
1
@@ -270,6 +276,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtp
-body_linecount 0
+-max_received_linelength 25
-deliver_firsttime
XX
1
Index: 0245
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0245,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0245 7 Feb 2006 10:47:37 -0000 1.1
+++ 0245 22 Jun 2007 14:38:58 -0000 1.2
@@ -10,6 +10,7 @@
-ident CALLER
-received_protocol local
-body_linecount 1
+-max_received_linelength 25
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0250
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0250,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0250 7 Feb 2006 10:47:37 -0000 1.1
+++ 0250 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 19
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
@@ -34,6 +35,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 19
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
@@ -63,6 +65,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0254
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0254,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0254 7 Feb 2006 10:47:37 -0000 1.1
+++ 0254 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 32
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
@@ -40,6 +41,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 14
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
@@ -68,6 +70,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 18
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0311
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0311,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0311 7 Feb 2006 10:47:37 -0000 1.1
+++ 0311 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 46
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
@@ -32,6 +33,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 46
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0338
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0338,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0338 7 Feb 2006 10:47:37 -0000 1.1
+++ 0338 22 Jun 2007 14:38:58 -0000 1.2
@@ -9,6 +9,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0377
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0377,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0377 7 Feb 2006 10:47:37 -0000 1.1
+++ 0377 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0378
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0378,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0378 7 Feb 2006 10:47:37 -0000 1.1
+++ 0378 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0379
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0379,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0379 7 Feb 2006 10:47:37 -0000 1.1
+++ 0379 22 Jun 2007 14:38:58 -0000 1.2
@@ -5,6 +5,7 @@
-ident CALLER
-received_protocol local
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-auth_sender CALLER@???
-allow_unqualified_recipient
Index: 0389
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0389,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0389 7 Feb 2006 10:47:37 -0000 1.1
+++ 0389 22 Jun 2007 14:38:58 -0000 1.2
@@ -13,6 +13,7 @@
-aclm 0 22
>Sender verify failed<
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-allow_unqualified_recipient
-allow_unqualified_sender
Index: 0488
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0488,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0488 7 Feb 2006 10:47:37 -0000 1.1
+++ 0488 22 Jun 2007 14:38:58 -0000 1.2
@@ -11,6 +11,7 @@
-ident CALLER
-received_protocol local-smtp
-body_linecount 0
+-max_received_linelength 0
-auth_id CALLER
-allow_unqualified_recipient
-allow_unqualified_sender
Index: 0490
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0490,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0490 7 Feb 2006 10:47:37 -0000 1.1
+++ 0490 22 Jun 2007 14:38:58 -0000 1.2
@@ -15,6 +15,7 @@
-ident CALLER
-received_protocol local-smtp
-body_linecount 2
+-max_received_linelength 6
-auth_id CALLER
-allow_unqualified_recipient
-allow_unqualified_sender
Index: 0514
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0514,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0514 7 Feb 2006 10:47:37 -0000 1.1
+++ 0514 22 Jun 2007 14:38:58 -0000 1.2
@@ -8,6 +8,7 @@
-ident spaced user
-received_protocol local
-body_linecount 1
+-max_received_linelength 7
-auth_id spaced user
-auth_sender spaced user@???
-allow_unqualified_recipient
Index: 0542
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0542,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0542 19 Dec 2006 16:40:27 -0000 1.4
+++ 0542 22 Jun 2007 14:38:58 -0000 1.5
@@ -1,9 +1,10 @@
> From: Himself <himself@???>
> Subject: The subject is not the object
-> message_body_size=33
-> message_size=369
+> message_body_size=71
+> message_size=407
> message_id=10HmaX-0005vi-00
> message_exim_id=10HmaX-0005vi-00
+> max_received_linelength=70
> recipients=userx@???, usery@???
>
> from: A Person <a.person@???>
@@ -14,6 +15,7 @@
> message_exim_id=10HmaY-0005vi-00
> message_linecount=6
> message_body_linecount=2
+> max_received_linelength=50
> headers -----------------
> From: A Person <a.person@???>
To: First <first@???>, Second <second@???>
Index: 3415
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/3415,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 3415 14 Mar 2007 12:15:56 -0000 1.2
+++ 3415 22 Jun 2007 14:38:58 -0000 1.3
@@ -153,6 +153,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtpa
-body_linecount 0
+-max_received_linelength 0
-auth_id username
-deliver_firsttime
XX
@@ -178,6 +179,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtpa
-body_linecount 0
+-max_received_linelength 0
-auth_id username
-deliver_firsttime
XX
@@ -201,6 +203,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtpa
-body_linecount 0
+-max_received_linelength 0
-auth_id username
-deliver_firsttime
XX
@@ -224,6 +227,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtpa
-body_linecount 0
+-max_received_linelength 0
-auth_id username@???
-deliver_firsttime
XX
@@ -247,6 +251,7 @@
-interface_address 127.0.0.1.1225
-received_protocol esmtpa
-body_linecount 0
+-max_received_linelength 15
-auth_id username@???
-deliver_firsttime
XX