From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 12 Jun 2017 08:57:52 +0000 (+0300)
Subject: imapc: Remove root_sep_lookup_failed cache
X-Git-Tag: 2.3.0.rc1~1431
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77ea60d15c146644da5428e8109e8fa6571af6dd;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Remove root_sep_lookup_failed cache

The auth_failed_* should already be enough for this. This removal also
fixes the storage error message to be auth_failed_reason when possible.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 2d3318fb44..0259997302 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -329,12 +329,9 @@ static char imapc_list_get_hierarchy_sep(struct mailbox_list *_list)
 	struct imapc_mailbox_list *list = (struct imapc_mailbox_list *)_list;
 	char sep;
 
-	if (list->root_sep_lookup_failed ||
-	    imapc_list_try_get_root_sep(list, &sep) < 0) {
+	if (imapc_list_try_get_root_sep(list, &sep) < 0) {
 		/* we can't really return a failure here. just return a common
 		   separator and fail all the future list operations. */
-		list->root_sep_lookup_failed = TRUE;
-		mailbox_list_set_internal_error(_list);
 		return '/';
 	}
 	return sep;
@@ -551,13 +548,10 @@ static int imapc_list_refresh(struct imapc_mailbox_list *list)
 	struct imapc_simple_context ctx;
 	struct mailbox_node *node;
 	const char *pattern;
+	char sep;
 
-	if (imapc_storage_client_handle_auth_failure(list->client))
-		return -1;
-	if (list->root_sep_lookup_failed) {
-		mailbox_list_set_internal_error(&list->list);
+	if (imapc_list_try_get_root_sep(list, &sep) < 0)
 		return -1;
-	}
 	if (list->refreshed_mailboxes)
 		return 0;
 
@@ -783,14 +777,12 @@ imapc_list_subscriptions_refresh(struct mailbox_list *_src_list,
 	struct imapc_simple_context ctx;
 	struct imapc_command *cmd;
 	const char *pattern;
-	char dest_sep = mail_namespace_get_sep(dest_list->ns);
+	char list_sep, dest_sep = mail_namespace_get_sep(dest_list->ns);
 
 	i_assert(src_list->tmp_subscriptions == NULL);
 
-	if (src_list->root_sep_lookup_failed) {
-		mailbox_list_set_internal_error(_src_list);
+	if (imapc_list_try_get_root_sep(src_list, &list_sep) < 0)
 		return -1;
-	}
 
 	if (src_list->refreshed_subscriptions) {
 		if (dest_list->subscriptions == NULL)
diff --git a/src/lib-storage/index/imapc/imapc-list.h b/src/lib-storage/index/imapc/imapc-list.h
index 84bdbe112c..b86060c25f 100644
--- a/src/lib-storage/index/imapc/imapc-list.h
+++ b/src/lib-storage/index/imapc/imapc-list.h
@@ -30,7 +30,6 @@ struct imapc_mailbox_list {
 	bool refreshed_mailboxes_recently:1;
 	bool index_list_failed:1;
 	bool root_sep_pending:1;
-	bool root_sep_lookup_failed:1;
 };
 
 int imapc_list_get_mailbox_flags(struct mailbox_list *list, const char *name,