diff options
| author | Thomas Roessler <roessler@does-not-exist.org> | 2002-02-26 10:38:43 +0000 |
|---|---|---|
| committer | Thomas Roessler <roessler@does-not-exist.org> | 2002-02-26 10:38:43 +0000 |
| commit | ddfe464110ab32346dcaf59c37a6d782ab4f3c14 (patch) | |
| tree | 17474dc7cd354869b4ce62414bac84d20b1ef005 | |
| parent | 480f56de91a2a60c7bc1acab19d0ca3daf54be85 (diff) | |
Brendan Cully sent a patch.
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | imap/browse.c | 2 | ||||
| -rw-r--r-- | imap/message.c | 1 | ||||
| -rw-r--r-- | mutt_sasl.c | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index b61225ba..f774592f 100644 --- a/configure.in +++ b/configure.in @@ -525,6 +525,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 @@ -578,8 +580,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" diff --git a/imap/browse.c b/imap/browse.c index 8accc836..43009957 100644 --- a/imap/browse.c +++ b/imap/browse.c @@ -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 != ')') diff --git a/imap/message.c b/imap/message.c index 540de7a9..b41bdf43 100644 --- a/imap/message.c +++ b/imap/message.c @@ -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!")); diff --git a/mutt_sasl.c b/mutt_sasl.c index f4ff9b68..4d6d7fe6 100644 --- a/mutt_sasl.c +++ b/mutt_sasl.c @@ -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) |