* serv_smtp.c: do not offer the PIPELINING extension when TLS is

  running.  Doing so causes sessions to hang unexpectedly.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 873a295920ebce3066f546953265245197c0e1eb..d993b71275c2bb698b6540fe6ce3b19ece18d967 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 614.65  2004/03/06 02:03:39  ajc
+ * serv_smtp.c: do not offer the PIPELINING extension when TLS is
+   running.  Doing so causes sessions to hang unexpectedly.
+
  Revision 614.64  2004/03/05 23:21:25  ajc
  * Added some more debugging to serv_smtp.c to try to figure out the
    problem with Postfix TLS hanging during send
@@ -5455,4 +5459,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 80a9934f7ef3c7fcc2a9b52c9c6db4aa07ca00dd..b6a05861a423dab34c943024dbcb43fa7ffb1df5 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -197,7 +197,12 @@ void smtp_hello(char *argbuf, int which_command) {
                }
                cprintf("250-HELP\r\n");
                cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
-               cprintf("250-PIPELINING\r\n");
+
+               /* PIPELINING and STARTTLS are mutually exclusive. */
+               if (!CC->redirect_ssl) {
+                       cprintf("250-PIPELINING\r\n");
+               }
+
                cprintf("250-AUTH LOGIN PLAIN\r\n");
                cprintf("250-AUTH=LOGIN PLAIN\r\n");
 #ifdef HAVE_OPENSSL