From: Timo Sirainen Date: Tue, 7 Feb 2023 22:27:50 +0000 (+0200) Subject: lib-storage: Replace direct settings-parser API calls with lib-master API X-Git-Tag: 2.4.0~2256 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c01b00c22c74554b094bbf7e95509001c9ce2c;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Replace direct settings-parser API calls with lib-master API --- diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 1855fd4870..7b933b95ee 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -133,11 +133,11 @@ static int set_keyvalue(struct mail_storage_service_ctx *ctx, if (*key == '\0') return 1; - old_value = settings_parse_get_value(set_parser, key, &type); + old_value = master_service_settings_find(set_parser, key, &type); if (old_value == NULL && !str_begins_with(key, "plugin/")) { /* assume it's a plugin setting */ key = t_strconcat("plugin/", key, NULL); - old_value = settings_parse_get_value(set_parser, key, &type); + old_value = master_service_settings_find(set_parser, key, &type); } if (master_service_set_has_config_override(ctx->service, key)) { @@ -1736,9 +1736,7 @@ int mail_storage_service_user_set_setting(struct mail_storage_service_user *user const char *value, const char **error_r) { - int ret = settings_parse_keyvalue(user->set_parser, key, value); - *error_r = settings_parser_get_error(user->set_parser); - return ret; + return master_service_set(user->set_parser, key, value, error_r); } const char *