From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 5 Jan 2023 09:32:03 +0000 (+0200)
Subject: mail-crypt: Use master_service_settings_get_or_fatal()
X-Git-Tag: 2.4.0~2330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d407bbec71890ebaace1b5b12df9ac5371f09ea9;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Use master_service_settings_get_or_fatal()
---

diff --git a/src/plugins/mail-crypt/fs-crypt-settings.c b/src/plugins/mail-crypt/fs-crypt-settings.c
index 2b7293f4b0..dffc3cf7fc 100644
--- a/src/plugins/mail-crypt/fs-crypt-settings.c
+++ b/src/plugins/mail-crypt/fs-crypt-settings.c
@@ -28,5 +28,6 @@ const struct setting_parser_info fs_crypt_setting_parser_info = {
 	.defaults = &fs_crypt_default_settings,
 
 	.struct_size = sizeof(struct fs_crypt_settings),
+	.pool_offset1 = 1 + offsetof(struct fs_crypt_settings, pool),
 	.dependencies = fs_crypt_setting_dependencies
 };
diff --git a/src/plugins/mail-crypt/fs-crypt-settings.h b/src/plugins/mail-crypt/fs-crypt-settings.h
index df1a7b19ad..e1aa94b160 100644
--- a/src/plugins/mail-crypt/fs-crypt-settings.h
+++ b/src/plugins/mail-crypt/fs-crypt-settings.h
@@ -2,6 +2,7 @@
 #define FS_CRYPT_SETTINGS_H
 
 struct fs_crypt_settings {
+	pool_t pool;
 	ARRAY(const char *) plugin_envs;
 };
 
diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
index 08203a8157..be814b59d5 100644
--- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c
+++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c
@@ -23,11 +23,12 @@ fs_crypt_load_settings(void)
 	i_zero(&input);
 	input.roots = set_roots;
 	input.service = "fs-crypt";
+	input.disable_check_settings = TRUE;
 	if (master_service_settings_read(master_service, &input,
 					 &output, &error) < 0)
 		i_fatal("%s", error);
 
-	return master_service_settings_get_root_set(master_service,
+	return master_service_settings_get_or_fatal(NULL,
 				&fs_crypt_setting_parser_info);
 }
 
@@ -103,5 +104,6 @@ int mail_crypt_global_keys_load_pluginenv(const char *set_prefix,
 
 	if (ret != 0)
 		mail_crypt_global_keys_free(global_keys_r);
+	master_service_settings_free(set);
 	return ret;
 }