From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 10 Mar 2023 23:12:33 +0000 (+0200)
Subject: lib-storage: mail_storage_service_lookup*() - Stop reading settings
X-Git-Tag: 2.4.0~2218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99080aeceea1da42f2da00e703bc6a69ddfd216d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_storage_service_lookup*() - Stop reading settings

The caller is now expected to have read them already.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index e4ff84e783..95ba3b601f 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1085,14 +1085,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
 		   but allow this instance to set its own settings without
 		   affecting the parent instance. */
 		set_instance = master_service_settings_instance_dup(input->set_instance);
-	} else if (mail_storage_service_read_settings(ctx, input, &set_instance,
-						    error_r) < 0) {
-		if (ctx->config_permission_denied) {
-			/* just restart and maybe next time we will open the
-			   config socket before dropping privileges */
-			i_fatal("%s", *error_r);
-		}
-		return -1;
+	} else {
+		set_instance = master_service_settings_instance_new(ctx->service);
 	}
 
 	if ((flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0 &&