lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accept NAMESPACE responses without hierarchy delimiter

Browse Source 
RFC2342 states that the delimiter may be NIL, which some servers
apparently actually make use of.

REFMAIL: CAM0xXk_FQ83CPrd37iQCMKtc1B2P8=u-r5jX0n2WE5Y+3483nQ@mail.gmail.com
This commit is contained in:
Oswald Buddenhagen 2016-12-04 11:23:47 +01:00
parent 03e25db3b8
commit ef0e7fdd3e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drv_imap.c
View File

@ -637,6 +637,12 @@ next_arg( char **ps )
return ret; return ret;
} }
static int
is_opt_atom( list_t *list )
{
return list && list->val && list->val != LIST;
}
static int static int
is_atom( list_t *list ) is_atom( list_t *list )
{ {
@ -850,7 +856,7 @@ parse_namespace_check( list_t *list )
goto bad; goto bad;
if (!is_atom( list->child )) if (!is_atom( list->child ))
goto bad; goto bad;
if (!is_atom( list->child->next )) if (!is_opt_atom( list->child->next ))
goto bad; goto bad;
/* Namespace response extensions may follow here; we don't care. */ /* Namespace response extensions may follow here; we don't care. */
} }
@ -2147,17 +2153,17 @@ static void
imap_open_store_namespace2( imap_store_t *ctx ) imap_open_store_namespace2( imap_store_t *ctx )
{ {
imap_store_conf_t *cfg = (imap_store_conf_t *)ctx->gen.conf; imap_store_conf_t *cfg = (imap_store_conf_t *)ctx->gen.conf;
list_t *nsp, *nsp_1st, *nsp_1st_ns, *nsp_1st_dl; list_t *nsp, *nsp_1st;
/* XXX for now assume 1st personal namespace */ /* XXX for now assume 1st personal namespace */
if (is_list( (nsp = ctx->ns_personal) ) && if (is_list( (nsp = ctx->ns_personal) ) &&
is_list( (nsp_1st = nsp->child) ) && is_list( (nsp_1st = nsp->child) ))
is_atom( (nsp_1st_ns = nsp_1st->child) ) &&
is_atom( (nsp_1st_dl = nsp_1st_ns->next) ))
{ {
list_t *nsp_1st_ns = nsp_1st->child;
list_t *nsp_1st_dl = nsp_1st_ns->next;
if (!ctx->prefix && cfg->use_namespace) if (!ctx->prefix && cfg->use_namespace)
ctx->prefix = nsp_1st_ns->val; ctx->prefix = nsp_1st_ns->val;
if (!ctx->delimiter) if (!ctx->delimiter && is_atom( nsp_1st_dl ))
ctx->delimiter = nfstrdup( nsp_1st_dl->val ); ctx->delimiter = nfstrdup( nsp_1st_dl->val );
} }
imap_open_store_finalize( ctx ); imap_open_store_finalize( ctx );