Commit 58526c04 authored by Thomas Roessler's avatar Thomas Roessler

Brendan Cully sent a patch.

parent 33f54346
......@@ -506,6 +506,8 @@ then
fi
AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
dnl -- end imap dependencies --
AC_ARG_WITH(ssl, [ --with-ssl[=PFX] Compile in SSL support for POP/IMAP],
[ if test "$with_ssl" != "no"
then
......@@ -559,8 +561,6 @@ AC_ARG_WITH(nss, [ --with-nss[=PFX] Compile in SSL support for POP/IM
fi
])
dnl -- end imap dependencies --
AC_ARG_WITH(sasl, [ --with-sasl[=PFX] Use Cyrus SASL library for POP/IMAP authentication],
[
if test "$need_socket" != "yes"
......
......@@ -439,7 +439,7 @@ static int browse_get_namespace (IMAP_DATA* idata, char* nsbuf, int nsblen,
for (type = IMAP_NS_PERSONAL; *s; type++)
{
s = imap_next_word (s);
if (ascii_strncasecmp (s, "NIL", 3))
if (*s && ascii_strncasecmp (s, "NIL", 3))
{
s++;
while (*s && *s != ')')
......
......@@ -145,7 +145,6 @@ int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
/* update context with message header */
ctx->hdrs[msgno] = mutt_new_header ();
ctx->hdrs[msgno]->index = ctx->msgcount;
ctx->hdrs[msgno]->index = h.sid - 1;
if (h.sid != ctx->msgcount + 1)
dprint (1, (debugfile, "imap_read_headers: msgcount and sequence ID are inconsistent!"));
......
......@@ -163,7 +163,8 @@ int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn)
* work for POP, we can make it a flag or move this code into
* imap/auth_sasl.c */
memset (&secprops, 0, sizeof (secprops));
secprops.max_ssf = (sasl_ssf_t) -1;
/* Work around a casting bug in the SASL krb4 module */
secprops.max_ssf = 0x7fff;
secprops.maxbufsize = M_SASL_MAXBUF;
secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
if (sasl_setprop (*saslconn, SASL_SEC_PROPS, &secprops) != SASL_OK)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment