From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 22 Aug 2024 08:08:53 +0000 (+0300)
Subject: quota: Move quota_args=hidden to quota_hidden setting
X-Git-Tag: 2.4.0~386
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78862034e7d6f6b2aba8727e1e6e2396b812ce77;p=thirdparty%2Fdovecot%2Fcore.git

quota: Move quota_args=hidden to quota_hidden setting
---

diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index 80cf943eef..bff01a4d84 100644
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -93,8 +93,6 @@ struct quota_root {
 	bool disable_unlimited_tracking:1;
 	/* Set while quota is being recalculated to avoid recursion. */
 	bool recounting:1;
-	/* Quota root is hidden (to e.g. IMAP GETQUOTAROOT) */
-	bool hidden:1;
 	/* Did we already check quota_over_status correctness? */
 	bool quota_over_status_checked:1;
 	/* Are there any quota warnings with threshold=under? */
diff --git a/src/plugins/quota/quota-settings.c b/src/plugins/quota/quota-settings.c
index 699c176fd8..330cf4932c 100644
--- a/src/plugins/quota/quota-settings.c
+++ b/src/plugins/quota/quota-settings.c
@@ -28,6 +28,7 @@ static const struct setting_define quota_setting_defines[] = {
 	DEF(STR, quota_driver),
 	DEF(STR, quota_args),
 	DEF(BOOL, quota_ignore),
+	DEF(BOOL, quota_hidden),
 	DEF(SIZE, quota_storage_size),
 	DEF(UINT, quota_storage_percentage),
 	DEF(SIZE, quota_storage_extra),
@@ -61,6 +62,7 @@ static const struct quota_settings quota_default_settings = {
 	.quota_driver = "count",
 	.quota_args = "",
 	.quota_ignore = FALSE,
+	.quota_hidden = FALSE,
 	.quota_storage_size = SET_SIZE_UNLIMITED,
 	.quota_storage_percentage = 100,
 	.quota_storage_extra = 0,
diff --git a/src/plugins/quota/quota-settings.h b/src/plugins/quota/quota-settings.h
index dd740d4180..2e83c9448f 100644
--- a/src/plugins/quota/quota-settings.h
+++ b/src/plugins/quota/quota-settings.h
@@ -26,6 +26,8 @@ struct quota_settings {
 	   this differs from unlimited quota, which still tracks the quota,
 	   even if it is not enforced. */
 	bool quota_ignore;
+	/* Quota root is hidden (to e.g. IMAP GETQUOTAROOT) */
+	bool quota_hidden;
 	/* Quota storage size is counted as:
 	   quota_storage_size * quota_storage_percentage / 100 +
 	   quota_storage_extra. */
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 5cb1218928..8f911d9384 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -49,11 +49,9 @@ static const struct quota_backend *quota_internal_backends[] = {
 
 static ARRAY(const struct quota_backend*) quota_backends;
 
-static void hidden_param_handler(struct quota_root *_root, const char *param_value);
 static void ignoreunlim_param_handler(struct quota_root *_root, const char *param_value);
 static void noenforcing_param_handler(struct quota_root *_root, const char *param_value);
 
-struct quota_param_parser quota_param_hidden = {.param_name = "hidden", .param_handler = hidden_param_handler};
 struct quota_param_parser quota_param_ignoreunlimited = {.param_name = "ignoreunlimited", .param_handler = ignoreunlim_param_handler};
 struct quota_param_parser quota_param_noenforcing = {.param_name = "noenforcing", .param_handler = noenforcing_param_handler};
 
@@ -153,7 +151,6 @@ int quota_root_default_init(struct quota_root *root, const char *args,
 			    const char **error_r)
 {
 	const struct quota_param_parser default_params[] = {
-		quota_param_hidden,
 		quota_param_ignoreunlimited,
 		quota_param_noenforcing,
 		{.param_name = NULL}
@@ -637,7 +634,7 @@ const char *const *quota_root_get_resources(struct quota_root *root)
 
 bool quota_root_is_hidden(struct quota_root *root)
 {
-	return root->hidden;
+	return root->set->quota_hidden;
 }
 
 enum quota_get_result
@@ -1290,11 +1287,6 @@ void quota_recalculate(struct quota_transaction_context *ctx,
 	ctx->recalculate = recalculate;
 }
 
-static void hidden_param_handler(struct quota_root *_root, const char *param_value ATTR_UNUSED)
-{
-	_root->hidden = TRUE;
-}
-
 static void ignoreunlim_param_handler(struct quota_root *_root, const char *param_value ATTR_UNUSED)
 {
 	_root->disable_unlimited_tracking = TRUE;