commit 5243c69863d4fa19f42241376239c550bf2bd55d
parent 4a5c79993cee3296da9a9e9311264b8c14dc928e
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date: Wed, 24 Nov 2021 23:05:29 +0100
require IMAP4rev1 capability
technically, we should have been doing that since the beginning, but as
there is IMAP4rev2 now, it might actually matter (in about a decade,
when servers start dropping backwards compat ...).
Diffstat:
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
@@ -225,7 +225,8 @@ typedef union {
#define CAP(cap) (ctx->caps & (1 << (cap)))
enum CAPABILITY {
- NOLOGIN = 0,
+ IMAP4REV1,
+ NOLOGIN,
#ifdef HAVE_LIBSASL
SASLIR,
#endif
@@ -244,6 +245,7 @@ static const struct {
const char *str;
uint len;
} cap_list[] = {
+ { "IMAP4REV1", 9 },
{ "LOGINDISABLED", 13 },
#ifdef HAVE_LIBSASL
{ "SASL-IR", 7 },
@@ -2088,6 +2090,12 @@ imap_open_store_authenticate( imap_store_t *ctx )
imap_server_conf_t *srvc = ctx->conf->server;
#endif
+ if (!CAP(IMAP4REV1)) {
+ error( "IMAP error: Server does not support IMAP4rev1\n" );
+ imap_open_store_bail( ctx, FAIL_FINAL );
+ return;
+ }
+
if (ctx->greeting != GreetingPreauth) {
#ifdef HAVE_LIBSSL
if (srvc->ssl_type == SSL_STARTTLS) {