From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 17 Nov 2023 10:17:28 +0000 (+0200)
Subject: plugins: acl - Remove settings from acl_user
X-Git-Tag: 2.4.1~1156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1aea8dd2b11deb162fe184568ba170fc2bc3fb5;p=thirdparty%2Fdovecot%2Fcore.git

plugins: acl - Remove settings from acl_user

They are no more needed.
---

diff --git a/src/plugins/acl/acl-plugin.h b/src/plugins/acl/acl-plugin.h
index b80c5a06a3..f142c8da55 100644
--- a/src/plugins/acl/acl-plugin.h
+++ b/src/plugins/acl/acl-plugin.h
@@ -22,9 +22,6 @@
 struct acl_user {
 	union mail_user_module_context module_ctx;
 
-	const char *acl_env;
-	const struct acl_settings *set;
-
 	struct acl_lookup_dict *acl_lookup_dict;
 };
 
@@ -38,7 +35,6 @@ struct acl_mailbox_list {
 	struct acl_storage_rights_context rights;
 
 	time_t last_shared_add_check;
-	bool ignore_acls;
 };
 
 struct acl_mailbox {
diff --git a/src/plugins/acl/acl-storage.c b/src/plugins/acl/acl-storage.c
index 7fc2030afc..2bba2c4520 100644
--- a/src/plugins/acl/acl-storage.c
+++ b/src/plugins/acl/acl-storage.c
@@ -24,7 +24,7 @@ static void acl_user_deinit(struct mail_user *user)
 	auser->module_ctx.super.deinit(user);
 }
 
-static void acl_mail_user_create(struct mail_user *user, const char *env)
+void acl_mail_user_created(struct mail_user *user)
 {
 	struct mail_user_vfuncs *v = user->vlast;
 	struct acl_user *auser;
@@ -44,36 +44,5 @@ static void acl_mail_user_create(struct mail_user *user, const char *env)
 		e_debug(user->event, "acl: Shared mailbox listing enabled");
 	}
 
-	struct acl_settings *set = p_new(user->pool, struct acl_settings, 1);
-	auser->acl_env = env;
-	set->acl_globals_only =
-		mail_user_plugin_getenv_bool(user, "acl_globals_only");
-	set->acl_defaults_from_inbox =
-		mail_user_plugin_getenv_bool(user, "acl_defaults_from_inbox");
-	set->acl_user = mail_user_plugin_getenv(user, "acl_user");
-	if (set->acl_user == NULL)
-		set->acl_user = mail_user_plugin_getenv(user, "master_user");
-
-	env = mail_user_plugin_getenv(user, "acl_groups");
-	if (env != NULL) {
-		p_array_init(&set->acl_groups, user->pool, 1);
-		const char *const *groups = (const char *const *)
-			p_strsplit_spaces(user->pool, env, ", ");
-		array_append(&set->acl_groups, groups, str_array_length(groups));
-		array_sort(&set->acl_groups, i_strcmp_p);
-	}
-
 	MODULE_CONTEXT_SET(user, acl_user_module, auser);
 }
-
-void acl_mail_user_created(struct mail_user *user)
-{
-	const char *env;
-
-	env = mail_user_plugin_getenv(user, "acl");
-	if (env != NULL && *env != '\0')
-		acl_mail_user_create(user, env);
-	else {
-		e_debug(user->event, "acl: No acl setting - ACLs are disabled");
-	}
-}