From: Timo Sirainen Date: Mon, 17 Apr 2023 22:11:39 +0000 (+0300) Subject: lib-master, global: Rename master_service_set_type to settings_override_type X-Git-Tag: 2.4.0~2163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e56857fd90fa59d1f76a18b4952c41d64ebeb591;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: Rename master_service_set_type to settings_override_type --- diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index 29cc6eea75..a6217d7986 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -469,7 +469,7 @@ cmd_dsync_run_local(struct dsync_cmd_context *ctx, struct mail_user *user, struct settings_instance *set_instance = mail_storage_service_user_get_settings_instance(ctx->ctx.cur_service_user); master_service_set(set_instance, "mail_location", location, - MASTER_SERVICE_SET_TYPE_CODE); + SETTINGS_OVERRIDE_TYPE_CODE); ret = mail_storage_service_next(ctx->ctx.storage_service, ctx->ctx.cur_service_user, &user2, &error); diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index 507fbd7f1e..1e7d40b625 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -335,7 +335,7 @@ static int cmd_force_resync_prerun(struct doveadm_mail_cmd_context *ctx ATTR_UNU mail_storage_service_user_get_settings_instance(service_user); master_service_set(set_instance, "mailbox_list_index_very_dirty_syncs", "no", - MASTER_SERVICE_SET_TYPE_CODE); + SETTINGS_OVERRIDE_TYPE_CODE); return 0; } diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index f117747694..8c27f334aa 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -78,16 +78,16 @@ struct settings_instance { ARRAY_TYPE(settings_override) overrides; }; -static const char *master_service_set_type_names[] = { +static const char *settings_override_type_names[] = { "userdb", "-o parameter", "hardcoded" }; -static_assert_array_size(master_service_set_type_names, - MASTER_SERVICE_SET_TYPE_COUNT); +static_assert_array_size(settings_override_type_names, + SETTINGS_OVERRIDE_TYPE_COUNT); static void settings_root_override(struct settings_root *root, const char *key, const char *value, - enum master_service_set_type type); + enum settings_override_type type); #undef DEF #define DEF(type, name) \ @@ -441,7 +441,7 @@ master_service_append_config_overrides(struct master_service *service) t_split_key_value_eq(cli_overrides[i], &key, &value); settings_root_override(service->settings_root, key, value, - MASTER_SERVICE_SET_TYPE_CLI_PARAM); + SETTINGS_OVERRIDE_TYPE_CLI_PARAM); } } @@ -1137,7 +1137,7 @@ settings_override_get_value(struct setting_parser_context *parser, no longer needed. */ const void *old_value = settings_parse_get_value(parser, key, &value_type); if (old_value == NULL && !str_begins_with(key, "plugin/") && - set->type == MASTER_SERVICE_SET_TYPE_USERDB) { + set->type == SETTINGS_OVERRIDE_TYPE_USERDB) { /* FIXME: Setting is unknown in this parser. Since the parser doesn't know all settings, we can't be sure if it's because it should simply be ignored or because it's a plugin setting. @@ -1213,7 +1213,7 @@ settings_instance_override(struct settings_root *root, *error_r = t_strdup_printf( "Failed to override configuration from %s: " "Invalid %s=%s: %s", - master_service_set_type_names[set->type], + settings_override_type_names[set->type], key, value, settings_parser_get_error(parser)); return -1; } @@ -1369,7 +1369,7 @@ master_service_settings_get_or_fatal(struct event *event, void master_service_set(struct settings_instance *instance, const char *key, const char *value, - enum master_service_set_type type) + enum settings_override_type type) { if (!array_is_created(&instance->overrides)) p_array_init(&instance->overrides, instance->pool, 16); @@ -1390,7 +1390,7 @@ void master_service_set(struct settings_instance *instance, static void settings_root_override(struct settings_root *root, const char *key, const char *value, - enum master_service_set_type type) + enum settings_override_type type) { if (!array_is_created(&root->overrides)) p_array_init(&root->overrides, root->pool, 16); diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h index 16615123c5..2b8ea43721 100644 --- a/src/lib-master/master-service-settings.h +++ b/src/lib-master/master-service-settings.h @@ -11,15 +11,15 @@ struct settings_root; struct settings_mmap; struct settings_instance; -enum master_service_set_type { +enum settings_override_type { /* Setting is from userdb. */ - MASTER_SERVICE_SET_TYPE_USERDB, + SETTINGS_OVERRIDE_TYPE_USERDB, /* Setting is from -o command line parameters. */ - MASTER_SERVICE_SET_TYPE_CLI_PARAM, + SETTINGS_OVERRIDE_TYPE_CLI_PARAM, /* Setting is hardcoded to be overridden in the code. */ - MASTER_SERVICE_SET_TYPE_CODE, + SETTINGS_OVERRIDE_TYPE_CODE, - MASTER_SERVICE_SET_TYPE_COUNT, + SETTINGS_OVERRIDE_TYPE_COUNT, }; enum master_service_settings_get_flags { @@ -197,7 +197,7 @@ master_service_settings_get_or_fatal(struct event *event, /* Override a setting. */ void master_service_set(struct settings_instance *instance, const char *key, const char *value, - enum master_service_set_type type); + enum settings_override_type type); /* Return a new instance for settings. */ struct settings_instance * diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index f382062e51..ba80ddf511 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -99,7 +99,7 @@ static void set_keyvalue(struct mail_storage_service_user *user, return; master_service_set(user->set_instance, key, value, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); if (strstr(key, "pass") != NULL) { /* possibly a password field (e.g. imapc_password). hide the value. */ @@ -147,13 +147,13 @@ user_reply_handle(struct mail_storage_service_user *user, user->uid_source = "userdb lookup"; master_service_set(user->set_instance, "mail_uid", dec2str(reply->uid), - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); } if (reply->gid != (uid_t)-1) { user->gid_source = "userdb lookup"; master_service_set(user->set_instance, "mail_gid", dec2str(reply->gid), - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); } if (home != NULL && chroot == NULL && @@ -167,7 +167,7 @@ user_reply_handle(struct mail_storage_service_user *user, if (home != NULL) { master_service_set(user->set_instance, "mail_home", home, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); user->home_from_userdb = TRUE; } @@ -179,7 +179,7 @@ user_reply_handle(struct mail_storage_service_user *user, return -1; } master_service_set(user->set_instance, "mail_chroot", chroot, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); } user->anonymous = reply->anonymous; @@ -990,10 +990,10 @@ mail_storage_service_update_chroot(struct mail_storage_service_user *user) master_service_set(user->set_instance, "mail_home", home, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); master_service_set(user->set_instance, "mail_chroot", chroot, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); } } else if (len > 0 && !use_chroot) { /* we're not going to chroot. fix home directory so we can @@ -1003,9 +1003,9 @@ mail_storage_service_update_chroot(struct mail_storage_service_user *user) else home = t_strconcat(chroot, home, NULL); master_service_set(user->set_instance, "mail_home", home, - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); master_service_set(user->set_instance, "mail_chroot", "", - MASTER_SERVICE_SET_TYPE_USERDB); + SETTINGS_OVERRIDE_TYPE_USERDB); } } @@ -1158,7 +1158,7 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx, if ((flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0) { master_service_set(user->set_instance, "mail_debug", "yes", - MASTER_SERVICE_SET_TYPE_CODE); + SETTINGS_OVERRIDE_TYPE_CODE); } if (userdb_fields != NULL) { @@ -1187,7 +1187,7 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx, prevent any of their hooks from being called. One easy way to do this is just to clear out the mail_plugins setting: */ master_service_set(user->set_instance, "mail_plugins", "", - MASTER_SERVICE_SET_TYPE_CODE); + SETTINGS_OVERRIDE_TYPE_CODE); } if (ret > 0) { mail_storage_service_update_chroot(user); diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c index 1eb8ff1b5f..06f9f221f5 100644 --- a/src/lmtp/lmtp-local.c +++ b/src/lmtp/lmtp-local.c @@ -468,7 +468,7 @@ lmtp_local_deliver(struct lmtp_local *local, proxy_data.timeout_secs <= 1 ? 1 : proxy_data.timeout_secs-1); master_service_set(set_instance, "mail_max_lock_timeout", - value, MASTER_SERVICE_SET_TYPE_CODE); + value, SETTINGS_OVERRIDE_TYPE_CODE); } master_service_settings_free(mail_set);