Increase incoming SMTP command buffer size from 512 to 2048 (see RFC

1869).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f4a898104f2be39c6ebd7cbd30038096d3a46e1c..b2a43652cdc560574359f2f8ff6a8e839b29e5a6 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.92 2005/03/15 15:36:41 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.93 2005/03/22 10:11:42 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -50,6 +50,11 @@ PH/06. A number of "verify =" ACL conditions have no options (e.g. verify =
        supplied for verify items that do not have them. (Maybe reverse_host_
        lookup should have a defer_ok option, but that's a different point.)
 
+PH/07. Increase the size of the buffer for incoming SMTP commands from 512 (as
+       defined by RFC 821) to 2048, because there were problems with some AUTH
+       commands, and RFC 1869 says the size should be increased for extended
+       SMTP commands that take arguments.
+
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 7328280be450a4edfa286c81852fb3216c674272..7348e9b15ac6a953426c6a0ad879054d6c7c76dd 100644 (file)
--- 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.13 2005/03/15 14:09:12 ph10 Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.14 2005/03/22 10:11:43 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -34,9 +34,12 @@ int deny_severity  = LOG_NOTICE;
 #endif
 
 
-/* Size of buffer for reading SMTP commands */
+/* Size of buffer for reading SMTP commands. We used to use 512, as defined
+by RFC 821. However, RFC 1869 specifies that this must be increased for SMTP
+commands that accept arguments, and this in particular applies to AUTH, where
+the data can be quite long. */
 
-#define cmd_buffer_size  512      /* Ref. RFC 821 */
+#define cmd_buffer_size  2048
 
 /* Size of buffer for reading SMTP incoming packets */