]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm import: Don't permanently activate source user's ioloop
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 19 Apr 2021 21:24:39 +0000 (00:24 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Wed, 29 Sep 2021 10:09:58 +0000 (10:09 +0000)
After the source user is initialized, the original user's ioloop should be
activated back.

src/doveadm/doveadm-mail-import.c

index 3b43c47fd320bbe9458f0c950046fe1d8ff31543..b05e84b7606ab876bfa51b217f61705c382b8a78 100644 (file)
@@ -171,6 +171,7 @@ static void cmd_import_init_source_user(struct import_cmd_context *ctx, struct m
                         ctx->src_username :
                         dest_user->username;
 
+       mail_storage_service_io_deactivate_user(ctx->ctx.cur_service_user);
        input.flags_override_add = MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES |
                MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS;
        if (mail_storage_service_lookup_next(ctx->ctx.storage_service, &input,
@@ -180,7 +181,9 @@ static void cmd_import_init_source_user(struct import_cmd_context *ctx, struct m
                i_fatal("Import namespace initialization failed: %s", error);
 
        ctx->src_user = user;
+       mail_storage_service_io_deactivate_user(service_user);
        mail_storage_service_user_unref(&service_user);
+       mail_storage_service_io_activate_user(ctx->ctx.cur_service_user);
 }
 
 static int