*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* If someone does it'd probably be trivial to write mutt_nss_get_ssf().
* I have a feeling more SSL code could be shared between those two files,
* but I haven't looked into it yet, since I still don't know the APIs. */
* If someone does it'd probably be trivial to write mutt_nss_get_ssf().
* I have a feeling more SSL code could be shared between those two files,
* but I haven't looked into it yet, since I still don't know the APIs. */
if (conn->account.flags & M_ACCT_SSL)
{
#ifdef USE_SASL2 /* I'm not sure this actually has an effect, at least with SASLv2 */
if (conn->account.flags & M_ACCT_SSL)
{
#ifdef USE_SASL2 /* I'm not sure this actually has an effect, at least with SASLv2 */
- sasldata->open = conn->open;
- sasldata->close = conn->close;
- sasldata->read = conn->read;
- sasldata->write = conn->write;
+ sasldata->msasl_open = conn->conn_open;
+ sasldata->msasl_close = conn->conn_close;
+ sasldata->msasl_read = conn->conn_read;
+ sasldata->msasl_write = conn->conn_write;
- conn->open = mutt_sasl_conn_open;
- conn->close = mutt_sasl_conn_close;
- conn->read = mutt_sasl_conn_read;
- conn->write = mutt_sasl_conn_write;
+ conn->conn_open = mutt_sasl_conn_open;
+ conn->conn_close = mutt_sasl_conn_close;
+ conn->conn_read = mutt_sasl_conn_read;
+ conn->conn_write = mutt_sasl_conn_write;
- conn->open = sasldata->open;
- conn->close = sasldata->close;
- conn->read = sasldata->read;
- conn->write = sasldata->write;
+ conn->conn_open = sasldata->msasl_open;
+ conn->conn_close = sasldata->msasl_close;
+ conn->conn_read = sasldata->msasl_read;
+ conn->conn_write = sasldata->msasl_write;