ph10 2005/08/02 09:25:45 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src smtp_in.c
exim-test-orig/AutoTest/log 349 350
exim-test-orig/AutoTest/rejectlog 349 350
Log:
Remove "violation:" from synchronization error message.
Revision Changes Path
1.189 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.21 +2 -3 exim/exim-src/src/smtp_in.c
1.3 +7 -7 exim/exim-test-orig/AutoTest/log/349
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/350
1.3 +7 -7 exim/exim-test-orig/AutoTest/rejectlog/349
1.2 +1 -1 exim/exim-test-orig/AutoTest/rejectlog/350
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- ChangeLog 1 Aug 2005 15:01:12 -0000 1.188
+++ ChangeLog 2 Aug 2005 08:25:45 -0000 1.189
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.188 2005/08/01 15:01:12 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.189 2005/08/02 08:25:45 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -27,6 +27,9 @@
PH/06 The use of forbid_filter_existstest now also locks out the use of the
${stat: expansion item.
+
+PH/07 Changed "SMTP protocol violation: synchronization error" into "SMTP
+ protocol synchronization error", to keep the pedants happy.
Exim version 4.52
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- smtp_in.c 27 Jun 2005 14:29:43 -0000 1.20
+++ smtp_in.c 2 Aug 2005 08:25:45 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.20 2005/06/27 14:29:43 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.21 2005/08/02 08:25:45 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1625,7 +1625,7 @@
{
if (rc > 150) rc = 150;
smtp_inbuffer[rc] = 0;
- log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: "
+ log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol "
"synchronization error (input sent without waiting for greeting): "
"rejected connection from %s input=\"%s\"", host_and_ident(TRUE),
string_printing(smtp_inbuffer));
@@ -3562,8 +3562,7 @@
if (c > 150) c = 150;
smtp_inptr[c] = 0;
incomplete_transaction_log(US"sync failure");
- log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: "
- "synchronization error "
+ log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol synchronization error "
"(next input sent too soon: pipelining was%s advertised): "
"rejected \"%s\" %s next input=\"%s\"",
pipelining_advertised? "" : " not",
Index: 349
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/349,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 349 13 Jan 2005 16:15:53 -0000 1.2
+++ 349 2 Aug 2005 08:25:45 -0000 1.3
@@ -1,14 +1,14 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail from:<ph10@???>\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail from:<ph10@???>\r\n"
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(abcd) [127.0.0.1] P=esmtp S=166
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="the message\r\nsecond line\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="the message\r\nsecond line\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [127.0.0.1] next input="rcpt to:<ph10@???>\r\n"
1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <ph10@???> R=r1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [127.0.0.1] next input="rcpt to:<ph10@???>\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [::1] next input="rcpt to:<ph10@???>\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "junk1" H=[::1] next input="junk2\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "rset" H=(abcd) [::1] next input="quit\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [::1] next input="rcpt to:<ph10@???>\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "junk1" H=[::1] next input="junk2\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "rset" H=(abcd) [::1] next input="quit\r\n"
1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=(dis.able) [127.0.0.1] P=esmtp S=182
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=r1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.2] input="helo abcd\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.2] input="helo abcd\r\n"
Index: 350
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/350,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 350 8 Oct 2004 14:49:31 -0000 1.1
+++ 350 2 Aug 2005 08:25:45 -0000 1.2
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? H=(abcd) [127.0.0.1] P=esmtp S=166
1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? H=(abcd) [127.0.0.1] P=esmtp S=166
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the message\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the message\r\n"
Index: 349
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/349,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 349 13 Jan 2005 16:15:53 -0000 1.2
+++ 349 2 Aug 2005 08:25:45 -0000 1.3
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail from:<ph10@???>\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="the message\r\nsecond line\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [127.0.0.1] next input="rcpt to:<ph10@???>\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [::1] next input="rcpt to:<ph10@???>\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "junk1" H=[::1] next input="junk2\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was not advertised): rejected "rset" H=(abcd) [::1] next input="quit\r\n"
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.2] input="helo abcd\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "ehlo abcd" H=[127.0.0.1] next input="mail from:<ph10@???>\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(abcd) [127.0.0.1] next input="the message\r\nsecond line\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [127.0.0.1] next input="rcpt to:<ph10@???>\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "mail from:<ph10@???>" H=(abcd) [::1] next input="rcpt to:<ph10@???>\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "junk1" H=[::1] next input="junk2\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "rset" H=(abcd) [::1] next input="quit\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (input sent without waiting for greeting): rejected connection from H=[127.0.0.2] input="helo abcd\r\n"
Index: 350
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/350,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 350 8 Oct 2004 14:49:51 -0000 1.1
+++ 350 2 Aug 2005 08:25:45 -0000 1.2
@@ -1 +1 @@
-1999-03-02 09:44:33 SMTP protocol violation: synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the message\r\n"
+1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was advertised): rejected "data" H=(en.force) [127.0.0.1] next input="the message\r\n"
