commit 062706fcbf39bcee536ea4b5c690e2f30e122faa
parent fc300fd811e56407d329a895e91e9dd84ca84297
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date: Wed, 3 Feb 2021 15:53:05 +0100
Merge branch '1.3'
Conflicts:
configure.ac
src/drv_imap.c
Diffstat:
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
@@ -1382,13 +1382,14 @@ parse_list_rsp_p2( imap_store_t *ctx, list_t *list, char *cmd ATTR_UNUSED )
}
arg = list->val;
argl = (int)list->len;
- if (is_inbox( ctx, arg, argl )) {
- // The server might be weird and have a non-uppercase INBOX. It
- // may legitimately do so, but we need the canonical spelling.
- memcpy( arg, "INBOX", 5 );
- } else if ((l = strlen( ctx->prefix ))) {
- if (!starts_with( arg, argl, ctx->prefix, l ))
+ if ((l = strlen( ctx->prefix ))) {
+ if (!starts_with( arg, argl, ctx->prefix, l )) {
+ if (is_inbox( ctx, arg, argl )) {
+ // INBOX and its subfolders bypass the namespace.
+ goto inbox;
+ }
return LIST_OK;
+ }
arg += l;
argl -= l;
// A folder named "INBOX" would be indistinguishable from the
@@ -1400,6 +1401,14 @@ parse_list_rsp_p2( imap_store_t *ctx, list_t *list, char *cmd ATTR_UNUSED )
warn( "IMAP warning: ignoring INBOX in %s\n", ctx->prefix );
return LIST_OK;
}
+ } else if (is_inbox( ctx, arg, argl )) {
+ inbox:
+ // The server might be weird and have a non-uppercase INBOX. It
+ // may legitimately do so, but we need the canonical spelling.
+ // Note that we do that only after prefix matching, under the
+ // assumption that the NAMESPACE (or Path) matches the
+ // capitalization of LIST.
+ memcpy( arg, "INBOX", 5 );
}
if (argl >= 5 && !memcmp( arg + argl - 5, ".lock", 5 )) /* workaround broken servers */
return LIST_OK;