X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl.c;h=a56147d6dcdc70c66ab49b37b3d701907af3677e;hp=8739a801606552f62f9d17cc380d7285d7460576;hb=23ccf6ef725820684b8ab9724e09bfc75d40b941;hpb=3d937534e7b1ee723f86594b5e4c64c95158a933

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 8739a80..a56147d 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -16,8 +16,9 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
-/* for SSL NO_* defines */
-#include "config.h"
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -115,9 +116,9 @@ int mutt_ssl_starttls (CONNECTION* conn)
 
   /* hmm. watch out if we're starting TLS over any method other than raw. */
   conn->sockdata = ssldata;
-  conn->read = ssl_socket_read;
-  conn->write = ssl_socket_write;
-  conn->close = tls_close;
+  conn->conn_read = ssl_socket_read;
+  conn->conn_write = ssl_socket_write;
+  conn->conn_close = tls_close;
 
   conn->ssf = SSL_CIPHER_get_bits (SSL_get_current_cipher (ssldata->ssl),
     &maxbits);
@@ -232,14 +233,14 @@ int ssl_socket_setup (CONNECTION * conn)
 {
   if (ssl_init() < 0)
   {
-    conn->open = ssl_socket_open_err;
+    conn->conn_open = ssl_socket_open_err;
     return -1;
   }
 
-  conn->open	= ssl_socket_open;
-  conn->read	= ssl_socket_read;
-  conn->write	= ssl_socket_write;
-  conn->close	= ssl_socket_close;
+  conn->conn_open	= ssl_socket_open;
+  conn->conn_read	= ssl_socket_read;
+  conn->conn_write	= ssl_socket_write;
+  conn->conn_close	= ssl_socket_close;
 
   return 0;
 }
@@ -372,9 +373,9 @@ static int tls_close (CONNECTION* conn)
   int rc;
 
   rc = ssl_socket_close (conn);
-  conn->read = raw_socket_read;
-  conn->write = raw_socket_write;
-  conn->close = raw_socket_close;
+  conn->conn_read = raw_socket_read;
+  conn->conn_write = raw_socket_write;
+  conn->conn_close = raw_socket_close;
 
   return rc;
 }