* Remove some unnecessary and possibly hazardous debugging code leftover

  from debugging IMAP STARTTLS

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ebcf2149168442d25e0c7adb60ecc09d77eb5126..3cf7224dcd790a244be60c6e9aba690933c98ecd 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 614.34  2004/02/16 18:16:39  error
+ * Remove some unnecessary and possibly hazardous debugging code leftover
+   from debugging IMAP STARTTLS
+
  Revision 614.33  2004/02/16 18:14:00  error
  * Fixed IMAP STARTTLS; trouble was in client_read_ssl the whole time.
    It should now be possible to implement SSL/TLS for any protocol.
@@ -5341,3 +5345,4 @@ 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_crypto.c b/citadel/serv_crypto.c
index 778985e37418b899a123a0855f08f1192fd38c0b..af5cf0885d6dd41660e38b4ca32f8e79a0bb7cb5 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -141,8 +141,6 @@ void init_ssl(void)
                         SSL_MODE_AUTO_RETRY);
 #endif
 #endif
-       SSL_CTX_set_mode(ssl_ctx, SSL_CTX_get_mode(ssl_ctx) |
-                       SSL_MODE_AUTO_RETRY);
 
        CRYPTO_set_locking_callback(ssl_lock);
        CRYPTO_set_id_callback(id_callback);