Increase timeouts to comply with RFC 1123; Debian bug report #152728 by Ian Jackson

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 5760356..bf0804e 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -60,14 +60,14 @@
 /*
  * these codes must all be different!
  */
-#define        SM_OPEN  90      /* Changed from 30 in case of nameserver flakiness */
+#define        SM_OPEN  300      /* Changed to 5 minutes to comply with a SHOULD in RFC 1123 */
 #define        SM_HELO  20
 #define        SM_RSET  15
-#define        SM_MAIL  40
-#define        SM_RCPT 120
-#define        SM_DATA  20
-#define        SM_TEXT 150
-#define        SM_DOT  180
+#define        SM_MAIL  301      /* changed to 5 minutes and a second (for uniqueness), see above */
+#define        SM_RCPT  302      /* see above */
+#define        SM_DATA  120      /* see above */
+#define        SM_TEXT 180     /* see above */
+#define        SM_DOT  600     /* see above */
 #define        SM_QUIT  30
 #define        SM_CLOS  10
 #define        SM_AUTH  45