* Temporarily disabled IMAP TLS support due to the discovery of some

  compatibility problems.  It will be re-enabled when they are fixed.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6c1bd575345f17f23ec9923ec971328cba07b453..4ae792e47aa27f8aee0f6b0cb085ddf2a4d3962b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 608.19  2003/08/13 14:30:47  ajc
+ * Temporarily disabled IMAP TLS support due to the discovery of some
+   compatibility problems.  It will be re-enabled when they are fixed.
+
  Revision 608.18  2003/08/12 00:39:35  ajc
  * setup now knows about lots of other mail programs it can disable (various
    flavors of Cyrus and Courier, for example)
@@ -4948,4 +4952,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_imap.c b/citadel/serv_imap.c
index 016e7f7c9859baabb30c1a17df42683c1870e4ad..b8d5acc930d28d18072995d14f7b368cebb0611b 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <limits.h>
 
-#ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL_XXX /* temporarily disabled due to bugs */
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
@@ -62,7 +62,7 @@
 #include "imap_store.h"
 #include "imap_misc.h"
 
-#ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL_XXX /* temporarily disabled due to bugs */
 #include "serv_crypto.h"
 #endif
 
@@ -386,9 +386,11 @@ void imap_auth_login_pass(char *cmd) {
  */
 void imap_capability(int num_parms, char *parms[]) {
        cprintf("* CAPABILITY IMAP4 IMAP4REV1 AUTH=LOGIN");
-#ifdef HAVE_OPENSSL
+
+#ifdef HAVE_OPENSSL_XXX /* temporarily disabled due to bugs */
        cprintf(" STARTTLS");
 #endif
+
        cprintf("\r\n");
        cprintf("%s OK CAPABILITY completed\r\n", parms[0]);
 }
@@ -397,7 +399,7 @@ void imap_capability(int num_parms, char *parms[]) {
 /*
  * implements the STARTTLS command
  */
-#ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL_XXX /* temporarily disabled due to bugs */
 void imap_starttls(int num_parms, char *parms[]) {
        int retval, bits, alg_bits;
 
@@ -1214,7 +1216,7 @@ void imap_command_loop(void) {
                imap_capability(num_parms, parms);
        }
 
-#ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL_XXX /* temporarily disabled due to bugs */
        else if (!strcasecmp(parms[1], "STARTTLS")) {
                imap_starttls(num_parms, parms);
        }