]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-storage: mail_storage_service_lookup*() - Stop reading settings
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Fri, 10 Mar 2023 23:12:33 +0000 (01:12 +0200)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 20 Nov 2023 12:20:55 +0000 (14:20 +0200)
The caller is now expected to have read them already.

src/lib-storage/mail-storage-service.c

index e4ff84e783649d22030c098c3c1f8f607b8b2187..95ba3b601ffc95072e47a0dfb4f5e5a7ff72674b 100644 (file)
@@ -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 &&