diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-02 08:25:45 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-02 08:25:45 +0000 |
| commit | 3af76a815c0f4ac04c80610364744b3a73846de9 (patch) | |
| tree | 4cf3227f5afc9ab51142bf7a0c6d7434399e9468 | |
| parent | 254e032f97775a5331fdeb3ba0df9a96f52494d7 (diff) | |
Remove "violation:" from synchronization error message.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 99ebabc3e..8dfb62269 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.188 2005/08/01 15:01:12 ph10 Exp $ +$Cambridge: 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 ------------------------------------------- @@ -28,6 +28,9 @@ PH/05 Replaced all Tom's calls to snprintf() with calls to the internal 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 ----------------- diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index a87e79611..f7549bb7c 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/smtp_in.c,v 1.20 2005/06/27 14:29:43 ph10 Exp $ */ +/* $Cambridge: 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 (smtp_enforce_sync && sender_host_address != NULL && !sender_host_notsocket) { 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 @@ while (done <= 0) 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", |