Andreas Krennmair:

	* added fix from jschmitt

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@69 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng
index edfea8c..a94839a 100644 (file)
--- a/ChangeLog.mutt-ng
+++ b/ChangeLog.mutt-ng
@@ -3,6 +3,7 @@ Changes specific to mutt-ng:
 2004-02-21:
   * Merged past mutt changes
   * Fixed a bug in mutt_FormatString regarding aligning the rest of a string to the right (%>)
 2004-02-21:
   * Merged past mutt changes
   * Fixed a bug in mutt_FormatString regarding aligning the rest of a string to the right (%>)

+  * Added fix from jschmitt

 
 2004-02-16:
   * fixed segfault in curs_lib.c
 
 2004-02-16:
   * fixed segfault in curs_lib.c

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 88cb71e..33e2b3a 100644 (file)
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -298,7 +298,7 @@ dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport))
    * 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 (defined(USE_SSL) || defined(USE_GNUTLS) && !defined(USE_NSS)
+#if (defined(USE_SSL) || defined(USE_GNUTLS) && !defined(USE_NSS))

   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 */