Don't send QUIT after a timeout in a callout connection.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 04b87509b37d5d88d95576b6d1cec4fd96563ff2..6c6b6641c0a296e2514ab0fa3780d27d4010a624 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.70 2005/01/13 16:15:52 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.71 2005/01/14 10:25:33 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -317,6 +317,11 @@ Exim version 4.50
     session; change 4.31/43 added the unwanted input to the log line - except
     that it did not do this in the start of session case. It now does.
 
     session; change 4.31/43 added the unwanted input to the log line - except
     that it did not do this in the start of session case. It now does.
 

+72. After a timeout in a callout SMTP session, Exim still sent a QUIT command.
+    This is wrong and can cause the other end to generate a synchronization
+    error if it is another Exim or anything else that does the synchronization
+    check. A QUIT command is no longer sent after a timeout.
+

 
 Exim version 4.43
 -----------------
 
 Exim version 4.43
 -----------------

diff --git a/src/src/verify.c b/src/src/verify.c
index f5f6b5d32ec0d1c5c57d50c584f2f7194577e1bb..8b8e329731cc0ee9c39c134f27fea364b2ab9add 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/verify.c,v 1.12 2005/01/12 15:41:27 ph10 Exp $ */
+/* $Cambridge: exim/src/src/verify.c,v 1.13 2005/01/14 10:25:33 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -377,6 +377,7 @@ for (host = host_list; host != NULL && !done; host = host->next)
   smtp_outblock outblock;
   int host_af;
   int port = 25;
   smtp_outblock outblock;
   int host_af;
   int port = 25;

+  BOOL send_quit = TRUE; 

   uschar *helo = US"HELO";
   uschar *interface = NULL;  /* Outgoing interface to use; NULL => any */
   uschar inbuffer[4096];
   uschar *helo = US"HELO";
   uschar *interface = NULL;  /* Outgoing interface to use; NULL => any */
   uschar inbuffer[4096];


@@ -609,6 +610,7 @@ for (host = host_list; host != NULL && !done; host = host->next)
     if (errno == ETIMEDOUT)
       {
       HDEBUG(D_verify) debug_printf("SMTP timeout\n");
     if (errno == ETIMEDOUT)
       {
       HDEBUG(D_verify) debug_printf("SMTP timeout\n");

+      send_quit = FALSE; 

       }
     else if (errno == 0)
       {
       }
     else if (errno == 0)
       {


@@ -637,7 +639,7 @@ for (host = host_list; host != NULL && !done; host = host->next)
 
   /* End the SMTP conversation and close the connection. */
 
 
   /* End the SMTP conversation and close the connection. */
 

-  (void)smtp_write_command(&outblock, FALSE, "QUIT\r\n");
+  if (send_quit) (void)smtp_write_command(&outblock, FALSE, "QUIT\r\n");

   close(inblock.sock);
   }    /* Loop through all hosts, while !done */
 
   close(inblock.sock);
   }    /* Loop through all hosts, while !done */