From: Timo Sirainen Date: Mon, 17 Apr 2023 22:25:44 +0000 (+0300) Subject: lib-master, global: Rename master_service_set() to settings_override() X-Git-Tag: 2.4.0~2162 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26fff0a98f0e0fcdbc76ea7bcb840f3dbad8a553;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: Rename master_service_set() to settings_override() --- diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index a6217d7986..ffa612a07c 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -468,8 +468,8 @@ cmd_dsync_run_local(struct dsync_cmd_context *ctx, struct mail_user *user, second location. */ 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, - SETTINGS_OVERRIDE_TYPE_CODE); + settings_override(set_instance, "mail_location", location, + 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 1e7d40b625..f9f35eb3b2 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -333,9 +333,9 @@ static int cmd_force_resync_prerun(struct doveadm_mail_cmd_context *ctx ATTR_UNU { struct settings_instance *set_instance = mail_storage_service_user_get_settings_instance(service_user); - master_service_set(set_instance, - "mailbox_list_index_very_dirty_syncs", "no", - SETTINGS_OVERRIDE_TYPE_CODE); + settings_override(set_instance, + "mailbox_list_index_very_dirty_syncs", "no", + 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 8c27f334aa..f46eccf77e 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -1367,9 +1367,9 @@ master_service_settings_get_or_fatal(struct event *event, return set; } -void master_service_set(struct settings_instance *instance, - const char *key, const char *value, - enum settings_override_type type) +void settings_override(struct settings_instance *instance, + const char *key, const char *value, + enum settings_override_type type) { if (!array_is_created(&instance->overrides)) p_array_init(&instance->overrides, instance->pool, 16); diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h index 2b8ea43721..defb924b5e 100644 --- a/src/lib-master/master-service-settings.h +++ b/src/lib-master/master-service-settings.h @@ -195,9 +195,9 @@ master_service_settings_get_or_fatal(struct event *event, } STMT_END /* Override a setting. */ -void master_service_set(struct settings_instance *instance, - const char *key, const char *value, - enum settings_override_type type); +void settings_override(struct settings_instance *instance, + const char *key, const char *value, + 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 ba80ddf511..da3a9eb6e8 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -98,8 +98,8 @@ static void set_keyvalue(struct mail_storage_service_user *user, if (*key == '\0') return; - master_service_set(user->set_instance, key, value, - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, key, value, + SETTINGS_OVERRIDE_TYPE_USERDB); if (strstr(key, "pass") != NULL) { /* possibly a password field (e.g. imapc_password). hide the value. */ @@ -145,15 +145,15 @@ user_reply_handle(struct mail_storage_service_user *user, return -1; } user->uid_source = "userdb lookup"; - master_service_set(user->set_instance, - "mail_uid", dec2str(reply->uid), - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, + "mail_uid", dec2str(reply->uid), + 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), - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, + "mail_gid", dec2str(reply->gid), + SETTINGS_OVERRIDE_TYPE_USERDB); } if (home != NULL && chroot == NULL && @@ -166,8 +166,8 @@ user_reply_handle(struct mail_storage_service_user *user, } if (home != NULL) { - master_service_set(user->set_instance, "mail_home", home, - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, "mail_home", home, + SETTINGS_OVERRIDE_TYPE_USERDB); user->home_from_userdb = TRUE; } @@ -178,8 +178,8 @@ user_reply_handle(struct mail_storage_service_user *user, "(see valid_chroot_dirs setting)", chroot); return -1; } - master_service_set(user->set_instance, "mail_chroot", chroot, - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, "mail_chroot", chroot, + SETTINGS_OVERRIDE_TYPE_USERDB); } user->anonymous = reply->anonymous; @@ -988,12 +988,12 @@ mail_storage_service_update_chroot(struct mail_storage_service_user *user) home = "/"; chroot = t_strndup(chroot, len - 2); - master_service_set(user->set_instance, - "mail_home", home, - SETTINGS_OVERRIDE_TYPE_USERDB); - master_service_set(user->set_instance, - "mail_chroot", chroot, - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, + "mail_home", home, + SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, + "mail_chroot", chroot, + SETTINGS_OVERRIDE_TYPE_USERDB); } } else if (len > 0 && !use_chroot) { /* we're not going to chroot. fix home directory so we can @@ -1002,10 +1002,10 @@ mail_storage_service_update_chroot(struct mail_storage_service_user *user) home = chroot; else home = t_strconcat(chroot, home, NULL); - master_service_set(user->set_instance, "mail_home", home, - SETTINGS_OVERRIDE_TYPE_USERDB); - master_service_set(user->set_instance, "mail_chroot", "", - SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, "mail_home", home, + SETTINGS_OVERRIDE_TYPE_USERDB); + settings_override(user->set_instance, "mail_chroot", "", + SETTINGS_OVERRIDE_TYPE_USERDB); } } @@ -1157,8 +1157,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx, var_expand_ctx.user = user; if ((flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0) { - master_service_set(user->set_instance, "mail_debug", "yes", - SETTINGS_OVERRIDE_TYPE_CODE); + settings_override(user->set_instance, "mail_debug", "yes", + SETTINGS_OVERRIDE_TYPE_CODE); } if (userdb_fields != NULL) { @@ -1186,8 +1186,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx, fine that extra plugins are loaded - we'll just need to 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", "", - SETTINGS_OVERRIDE_TYPE_CODE); + settings_override(user->set_instance, "mail_plugins", "", + 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 06f9f221f5..858542d31f 100644 --- a/src/lmtp/lmtp-local.c +++ b/src/lmtp/lmtp-local.c @@ -467,8 +467,8 @@ lmtp_local_deliver(struct lmtp_local *local, const char *value = t_strdup_printf("%us", proxy_data.timeout_secs <= 1 ? 1 : proxy_data.timeout_secs-1); - master_service_set(set_instance, "mail_max_lock_timeout", - value, SETTINGS_OVERRIDE_TYPE_CODE); + settings_override(set_instance, "mail_max_lock_timeout", + value, SETTINGS_OVERRIDE_TYPE_CODE); } master_service_settings_free(mail_set);