]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Add plugin_dependency for settings coming from plugins
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 3 Mar 2025 12:52:12 +0000 (14:52 +0200)
committertimo.sirainen <timo.sirainen@open-xchange.com>
Sat, 8 Mar 2025 06:56:18 +0000 (06:56 +0000)
32 files changed:
src/auth/db-ldap-settings.c
src/auth/db-lua.c
src/lib-sql/driver-cassandra.c
src/lib-sql/driver-mysql.c
src/lib-sql/driver-pgsql.c
src/lib-sql/driver-sqlite.c
src/plugins/acl/acl-settings.c
src/plugins/apparmor/apparmor-plugin.c
src/plugins/charset-alias/charset-alias-plugin.c
src/plugins/fs-compress/fs-compress.c
src/plugins/fts-flatcurve/fts-flatcurve-settings.c
src/plugins/fts-solr/fts-solr-settings.c
src/plugins/fts/fts-settings.c
src/plugins/imap-acl/imap-acl-plugin.c
src/plugins/last-login/last-login-plugin.c
src/plugins/lazy-expunge/lazy-expunge-settings.c
src/plugins/mail-compress/mail-compress-plugin.c
src/plugins/mail-crypt/crypt-settings.c
src/plugins/mail-log/mail-log-plugin.c
src/plugins/mail-lua/mail-lua-settings.c
src/plugins/notify-status/notify-status-plugin.c
src/plugins/pop3-migration/pop3-migration-plugin.c
src/plugins/push-notification/push-notification-settings.c
src/plugins/quota-clone/quota-clone-settings.c
src/plugins/quota/quota-fs.c
src/plugins/quota/quota-imapc.c
src/plugins/quota/quota-settings.c
src/plugins/quota/quota-status-settings.c
src/plugins/quota/quota-status.c
src/plugins/trash/trash-plugin.c
src/plugins/virtual/virtual-settings.c
src/plugins/welcome/welcome-plugin.c

index dd19aaf70f5f96cda4ba3492a438542a7dfac355..6c8feb334e3edba357c1c72ee01e0133a63c7b1b 100644 (file)
@@ -59,6 +59,9 @@ static const struct setting_keyvalue ldap_default_settings_keyvalue[] = {
 
 const struct setting_parser_info ldap_setting_parser_info = {
        .name = "auth_ldap",
+#ifndef BUILTIN_LDAP
+       .plugin_dependency = "auth/libauthdb_ldap",
+#endif
 
        .check_func = ldap_setting_check,
        .defines = ldap_setting_defines,
@@ -95,6 +98,9 @@ static const struct ldap_pre_settings ldap_pre_default_settings = {
 
 const struct setting_parser_info ldap_pre_setting_parser_info = {
        .name = "auth_ldap_pre",
+#ifndef BUILTIN_LDAP
+       .plugin_dependency = "auth/libauthdb_ldap",
+#endif
 
        .defines = ldap_pre_setting_defines,
        .defaults = &ldap_pre_default_settings,
@@ -118,6 +124,9 @@ static const struct ldap_post_settings ldap_post_default_settings = {
 
 const struct setting_parser_info ldap_post_setting_parser_info = {
        .name = "auth_ldap_post",
+#ifndef BUILTIN_LDAP
+       .plugin_dependency = "auth/libauthdb_ldap",
+#endif
 
        .defines = ldap_post_setting_defines,
        .defaults = &ldap_post_default_settings,
index ce65b3fb4951a9f8684e01e1ae4e5a4dc213a7e5..c3c2e6739621812b786a0a2762a24d5a633fc7ea 100644 (file)
@@ -56,6 +56,9 @@ static const struct setting_keyvalue auth_lua_default_settings_keyvalue[] = {
 
 const struct setting_parser_info auth_lua_setting_parser_info = {
        .name = "auth_lua",
+#ifndef BUILTIN_LUA
+       .plugin_dependency = "auth/libauthdb_lua",
+#endif
 
        .defines = auth_lua_setting_defines,
        .default_settings = auth_lua_default_settings_keyvalue,
index 21284d6d6233d55b5f2f76e2c4bca6247261d712..f935e8a9589286bce216cbe4c7a687cfc11637e2 100644 (file)
@@ -230,6 +230,9 @@ static struct cassandra_settings cassandra_default_settings = {
 
 const struct setting_parser_info cassandra_setting_parser_info = {
        .name = "cassandra",
+#ifdef SQL_DRIVER_PLUGINS
+       .plugin_dependency = "libdriver_cassandra",
+#endif
 
        .defines = cassandra_setting_defines,
        .defaults = &cassandra_default_settings,
index d5057b3a27c595d00a66d8a1320882ad46d565e2..d16131858e87a4e4cbf1eb85332fe67fb7243d18 100644 (file)
@@ -109,6 +109,9 @@ static struct mysql_settings mysql_default_settings = {
 
 const struct setting_parser_info mysql_setting_parser_info = {
        .name = "mysql",
+#ifdef SQL_DRIVER_PLUGINS
+       .plugin_dependency = "libdriver_mysql",
+#endif
 
        .defines = mysql_setting_defines,
        .defaults = &mysql_default_settings,
index 6c0c66de337b1f0955c5d7eb66b2ac207ba3f53d..c6872589bed7990d9fa20bb4dfc0041805325592 100644 (file)
@@ -54,6 +54,9 @@ static const struct pgsql_settings pgsql_default_settings = {
 
 const struct setting_parser_info pgsql_setting_parser_info = {
        .name = "pgsql",
+#ifdef SQL_DRIVER_PLUGINS
+       .plugin_dependency = "libdriver_pgsql",
+#endif
 
        .defines = pgsql_setting_defines,
        .defaults = &pgsql_default_settings,
index a3adc243203962e6c38ed6c5307dc31c523eddab..282a83bbf47039a35659ac9949cff923bc58d88b 100644 (file)
@@ -69,6 +69,9 @@ static const struct sqlite_settings sqlite_default_settings = {
 };
 const struct setting_parser_info sqlite_setting_parser_info = {
        .name = "sqlite",
+#ifdef SQL_DRIVER_PLUGINS
+       .plugin_dependency = "libdriver_sqlite",
+#endif
 
        .defines = sqlite_setting_defines,
        .defaults = &sqlite_default_settings,
index 5e0ec86da62a8b918ef872ca4530fb181382b23e..a26500881d460d2611e8a77d679d56b9c16f3a4d 100644 (file)
@@ -28,6 +28,7 @@ static bool acl_rights_settings_check(void *_set, pool_t ATTR_UNUSED pool,
 
 const struct setting_parser_info acl_rights_setting_parser_info = {
        .name = "acl_rights",
+       .plugin_dependency = "lib01_acl_plugin",
 
        .defines = acl_rights_setting_defines,
        .defaults = &acl_rights_default_settings,
@@ -79,6 +80,7 @@ static bool acl_settings_check(void *_set ATTR_UNUSED, pool_t pool ATTR_UNUSED,
 
 const struct setting_parser_info acl_setting_parser_info = {
        .name = "acl",
+       .plugin_dependency = "lib01_acl_plugin",
 
        .defines = acl_setting_defines,
        .defaults = &acl_default_settings,
index 1e6447352fd0540fd571d4cb0078ce386d32675a..18cf3bbb1a8f95e4c98b4aae8cd513ddbd18e0aa 100644 (file)
@@ -47,6 +47,7 @@ static const struct apparmor_settings apparmor_default_settings = {
 
 const struct setting_parser_info apparmor_setting_parser_info = {
        .name = "apparmor",
+       .plugin_dependency = "lib01_apparmor_plugin",
 
        .defines = apparmor_setting_defines,
        .defaults = &apparmor_default_settings,
index ec1299d8bbbb0d0a59ac621545d023dbce12cbce..83f0cb95ce3419057f34497099476024ee4fb92c 100644 (file)
@@ -64,6 +64,7 @@ static const struct charset_alias_settings charset_alias_default_settings = {
 
 const struct setting_parser_info charset_alias_setting_parser_info = {
        .name = "charset_alias",
+       .plugin_dependency = "lib20_charset_alias_plugin",
 
        .defines = charset_alias_setting_defines,
        .defaults = &charset_alias_default_settings,
index 50cb6af5216470c8f1e7dfb2247d76732291fb2d..d132f239498677b728217610f4243e4743ed59cd 100644 (file)
@@ -55,6 +55,7 @@ static const struct fs_compress_settings fs_compress_default_settings = {
 
 const struct setting_parser_info fs_compress_setting_parser_info = {
        .name = "fs_compress",
+       .plugin_dependency = "libfs_compress",
 
        .defines = fs_compress_setting_defines,
        .defaults = &fs_compress_default_settings,
index 3ca04c75100e6221d898ac1e1c410018a68dc805..1bbe3e974105e9997fe7065c610f2f8dfd5fdc31 100644 (file)
@@ -32,6 +32,7 @@ static const struct fts_flatcurve_settings fts_flatcurve_default_settings = {
 
 const struct setting_parser_info fts_flatcurve_setting_parser_info = {
        .name = "fts_flatcurve",
+       .plugin_dependency = "lib21_fts_flatcurve_plugin",
 
        .defines = fts_flatcurve_setting_defines,
        .defaults = &fts_flatcurve_default_settings,
index 43a2e6c0f7e40383db63710406bc27e261f7118b..48e51a42475b280755bddf7aeec2a09f05a3b700 100644 (file)
@@ -36,6 +36,7 @@ static const struct setting_keyvalue fts_solr_default_settings_keyvalue[] = {
 
 const struct setting_parser_info fts_solr_setting_parser_info = {
        .name = FTS_SOLR_FILTER,
+       .plugin_dependency = "lib21_fts_solr_plugin",
 
        .defines = fts_solr_setting_defines,
        .defaults = &fts_solr_default_settings,
index 298581e58ad12686abe09db49b41afb06bdeb34e..493af6a073c155762e486987e2df71d319d3b239 100644 (file)
@@ -74,6 +74,7 @@ static const struct setting_keyvalue fts_default_settings_keyvalue[] = {
 
 const struct setting_parser_info fts_setting_parser_info = {
        .name = FTS_FILTER,
+       .plugin_dependency = "lib20_fts_plugin",
 
        .defines = fts_setting_defines,
        .defaults = &fts_default_settings,
index f72fb9a9eb73128129e7645db326e6e7c38f7c1c..df403d0d9744aa8ed9b634893e16c9a651b797ce 100644 (file)
@@ -62,6 +62,7 @@ static struct imap_acl_settings imap_acl_default_settings = {
 
 const struct setting_parser_info imap_acl_setting_parser_info = {
        .name = "imap_acl",
+       .plugin_dependency = "lib02_imap_acl_plugin",
 
        .defines = imap_acl_setting_defines,
        .defaults = &imap_acl_default_settings,
index bdb1dbf66946d17fe361ca0a69aa32537d093ee0..b5a93704bd451a2cf6e4dede2b6ef788cc9db6dd 100644 (file)
@@ -44,6 +44,7 @@ static const struct last_login_settings last_login_default_settings = {
 
 const struct setting_parser_info last_login_setting_parser_info = {
        .name = "last_login",
+       .plugin_dependency = "lib10_last_login_plugin",
 
        .defines = last_login_setting_defines,
        .defaults = &last_login_default_settings,
index d0fed68ba579dd39960b8f1a078a589010ff3db8..7265ce2afbd3e629323435b0c1b13f5a4390e231 100644 (file)
@@ -22,6 +22,7 @@ static struct lazy_expunge_settings lazy_expunge_default_settings = {
 
 const struct setting_parser_info lazy_expunge_setting_parser_info = {
        .name = "lazy_expunge",
+       .plugin_dependency = "lib02_lazy_expunge_plugin",
 
        .defines = lazy_expunge_setting_defines,
        .defaults = &lazy_expunge_default_settings,
index ccb2254a8b6f2d454de6a816045c9e8d596927f1..34a509cef6ca98ac3887adc7d749244ff0299235 100644 (file)
@@ -62,6 +62,7 @@ static struct mail_compress_settings mail_compress_default_settings = {
 
 const struct setting_parser_info mail_compress_setting_parser_info = {
        .name = "mail_compress",
+       .plugin_dependency = "lib20_mail_compress_plugin",
 
        .defines = mail_compress_setting_defines,
        .defaults = &mail_compress_default_settings,
index fc5c93eb6edb219cea1583e66b9fb3cb5f5d22a7..bd9ad5aeb61b0365b36bcdf6e14728a43a3c5a68 100644 (file)
@@ -23,6 +23,7 @@ static const struct crypt_private_key_settings crypt_private_key_default_setting
 
 const struct setting_parser_info crypt_private_key_setting_parser_info = {
        .name = "crypt_private_key",
+       .plugin_dependency = "lib10_mail_crypt_plugin",
 
        .defines = crypt_private_key_setting_defines,
        .defaults = &crypt_private_key_default_settings,
@@ -70,6 +71,7 @@ static const struct crypt_settings crypt_default_settings = {
 
 const struct setting_parser_info crypt_setting_parser_info = {
        .name = "crypt",
+       .plugin_dependency = "lib10_mail_crypt_plugin",
 
        .defines = crypt_setting_defines,
        .defaults = &crypt_default_settings,
@@ -93,6 +95,7 @@ static const struct crypt_acl_settings crypt_acl_default_settings = {
 
 const struct setting_parser_info crypt_acl_setting_parser_info = {
        .name = "crypt_acl",
+       .plugin_dependency = "lib05_mail_crypt_acl_plugin",
 
        .defines = crypt_acl_setting_defines,
        .defaults = &crypt_acl_default_settings,
index 75b3ea119004d7c0fb80ccf7bc581eabe6864406..634f12a9bcf64f44ee7dc00a729183b4f4f576d6 100644 (file)
@@ -133,6 +133,7 @@ static bool mail_log_settings_check(void *_set, pool_t pool, const char **error_
 
 const struct setting_parser_info mail_log_setting_parser_info = {
        .name = "mail_log",
+       .plugin_dependency = "lib20_mail_log_plugin",
 
        .defines = mail_log_setting_defines,
        .defaults = &mail_log_default_settings,
index 338627e9c5a014cee5ad29cb24c9710e439e7c30..51b8ba78396ccb1474af4bc4f05c743cd3797619 100644 (file)
@@ -15,6 +15,7 @@ static const struct mail_lua_settings mail_lua_default_settings = {
 
 const struct setting_parser_info mail_lua_setting_parser_info = {
        .name = "mail_lua",
+       .plugin_dependency = "lib01_mail_lua_plugin",
 
        .defines = mail_lua_setting_defines,
        .defaults = &mail_lua_default_settings,
index 1c58a27902ec606a049d922f91afec86b5f63f25..adb26624f1d5d038f98ea30ce139b048720c452a 100644 (file)
@@ -56,6 +56,7 @@ static const struct notify_status_plugin_settings notify_status_plugin_default_s
 
 const struct setting_parser_info notify_status_plugin_setting_parser_info = {
        .name = "notify_status",
+       .plugin_dependency = "lib20_notify_status_plugin",
 
        .defines = notify_status_plugin_setting_defines,
        .defaults = &notify_status_plugin_default_settings,
index fb3f90a703c120ef5a718a370508a1e2cdc94310..498d35420401f8e3a650a41d0b29316a63594ed0 100644 (file)
@@ -110,6 +110,7 @@ static const struct pop3_migration_settings pop3_migration_default_settings = {
 
 const struct setting_parser_info pop3_migration_setting_parser_info = {
        .name = "pop3_migration",
+       .plugin_dependency = "lib05_pop3_migration_plugin",
 
        .defines = pop3_migration_setting_defines,
        .defaults = &pop3_migration_default_settings,
index 54d67521758cebd0b52e415c1161d0899c0daa74..11d89474b5ea0fe211e48584979eae86cf50b3cc 100644 (file)
@@ -38,6 +38,7 @@ static const struct push_notification_ox_settings push_notification_ox_default_s
 
 const struct setting_parser_info push_notification_ox_setting_parser_info = {
        .name = "push_notification_ox",
+       .plugin_dependency = "lib20_push_notification_plugin",
 
        .defines = push_notification_ox_setting_defines,
        .defaults = &push_notification_ox_default_settings,
@@ -72,6 +73,7 @@ static const struct push_notification_settings push_notification_default_setting
 
 const struct setting_parser_info push_notification_setting_parser_info = {
        .name = "push_notification",
+       .plugin_dependency = "lib20_push_notification_plugin",
 
        .defines = push_notification_setting_defines,
        .defaults = &push_notification_default_settings,
index dac2e5435ce45aa8dd9b3a4b8b5b80311f845957..43217bb248a048847bcaf42466a1a145dfe8c5a5 100644 (file)
@@ -23,6 +23,7 @@ static const struct quota_clone_settings quota_clone_default_settings = {
 
 const struct setting_parser_info quota_clone_setting_parser_info = {
        .name = "quota_clone",
+       .plugin_dependency = "lib20_quota_clone_plugin",
        .defines = quota_clone_setting_defines,
        .defaults = &quota_clone_default_settings,
        .struct_size = sizeof(struct quota_clone_settings),
index c5fe869f81c2dd14a722c0a311527b63921a11f3..040acdc0e2ff49ca86edb8122dc53e2a33be7df2 100644 (file)
@@ -124,6 +124,7 @@ static const struct quota_fs_settings quota_fs_default_settings = {
 
 const struct setting_parser_info quota_fs_setting_parser_info = {
        .name = "quota_fs",
+       .plugin_dependency = "lib10_quota_plugin",
        .defines = quota_fs_setting_defines,
        .defaults = &quota_fs_default_settings,
        .struct_size = sizeof(struct quota_fs_settings),
index 4b650e69cbb2d3ec6949b8a90f778f3609ffdb4d..056df19f71cfa9b2fd2b3a0d7e41d8f4686bdf15 100644 (file)
@@ -69,6 +69,7 @@ static const struct setting_keyvalue quota_imapc_default_settings_keyvalue[] = {
 };
 const struct setting_parser_info quota_imapc_setting_parser_info = {
        .name = "quota_imapc",
+       .plugin_dependency = "lib10_quota_plugin",
        .defines = quota_imapc_setting_defines,
        .defaults = &quota_imapc_default_settings,
        .default_settings = quota_imapc_default_settings_keyvalue,
index 3571f071126cf8b6f7660a2800167061f5869f87..0760c6f00f83bf10a8a077c9d8cf741ff7b26564 100644 (file)
@@ -37,6 +37,7 @@ static const struct quota_settings quota_default_settings = {
 
 const struct setting_parser_info quota_setting_parser_info = {
        .name = "quota",
+       .plugin_dependency = "lib10_quota_plugin",
        .defines = quota_setting_defines,
        .defaults = &quota_default_settings,
        .struct_size = sizeof(struct quota_settings),
@@ -107,6 +108,7 @@ static const struct quota_root_settings quota_root_default_settings = {
 
 const struct setting_parser_info quota_root_setting_parser_info = {
        .name = "quota_root",
+       .plugin_dependency = "lib10_quota_plugin",
        .defines = quota_root_setting_defines,
        .defaults = &quota_root_default_settings,
        .struct_size = sizeof(struct quota_root_settings),
index 6820df3ed1a8f3b75d39cd9ec31534a2099c0dab..8371757f9653c0034b854ba97767787959e5016c 100644 (file)
@@ -24,6 +24,7 @@ static const struct quota_status_settings quota_status_default_settings = {
 
 const struct setting_parser_info quota_status_setting_parser_info = {
        .name = "quota_status",
+       .plugin_dependency = "lib10_quota_plugin",
 
        .defines = quota_status_setting_defines,
        .defaults = &quota_status_default_settings,
index b5b25bdc7347dfc3cbefb7db17fdc550dd1defc1..860555421c23868f4218372f6040b60dca52ab05 100644 (file)
@@ -62,6 +62,7 @@ static const struct quota_status_result_settings quota_status_result_default_set
 
 const struct setting_parser_info quota_status_result_setting_parser_info = {
        .name = "quota_status_result",
+       .plugin_dependency = "lib10_quota_plugin",
        .defines = quota_status_result_setting_defines,
        .defaults = &quota_status_result_default_settings,
        .struct_size = sizeof(struct quota_status_result_settings),
index 6f6b0055bba27e7f0ea854ce3173aabb0f5de853..827ba91ec5d6da605bf72848ac4ea7f07a34ed08 100644 (file)
@@ -87,6 +87,7 @@ static const struct trash_settings trash_default_settings = {
 
 const struct setting_parser_info trash_setting_parser_info = {
        .name = "trash",
+       .plugin_dependency = "lib11_trash_plugin",
 
        .defines = trash_setting_defines,
        .defaults = &trash_default_settings,
index 5d5605bf1511d87298d9758514bf786d2b63f57e..607f21af39eed04938b3051fb3d123669beaee59 100644 (file)
@@ -26,6 +26,7 @@ static const struct setting_keyvalue virtual_default_settings_keyvalue[] = {
 
 const struct setting_parser_info virtual_setting_parser_info = {
        .name = "virtual",
+       .plugin_dependency = "lib20_virtual_plugin",
 
        .defines = virtual_setting_defines,
        .defaults = &virtual_default_settings,
index d01e7d50084b700cfaf96550b91452cbe1e9007c..0429f2e9f50369fa84fd2cbc129872ef5a62d41d 100644 (file)
@@ -48,6 +48,7 @@ static const struct welcome_settings welcome_default_settings = {
 };
 const struct setting_parser_info welcome_setting_parser_info = {
        .name = "welcome",
+       .plugin_dependency = "lib99_welcome_plugin",
        .defines = welcome_setting_defines,
        .defaults = &welcome_default_settings,
        .struct_size = sizeof(struct welcome_settings),