doveadm: doveadm-mail - Reorder code in doveadm_cmdv2_wrapper_parse_common_options

Simplifies next change.

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index b58987a2c7ef17d8f114603d8bc20a1da9867e19..7f76c3561c222a26ef7976497315c4a2ab4b4b27 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -816,12 +816,6 @@ doveadm_cmdv2_wrapper_parse_common_options(struct doveadm_mail_cmd_context *mctx
                mctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
                *wildcard_user_r = "*";
        }
-
-       if (doveadm_cmd_param_str(cctx, "socket-path",
-                                 &doveadm_settings->doveadm_socket_path) &&
-           doveadm_settings->doveadm_worker_count == 0)
-                               doveadm_settings->doveadm_worker_count = 1;
-
        if (doveadm_cmd_param_istream(cctx, "user-file", &mctx->users_list_input)) {
                i_stream_ref(mctx->users_list_input);
                mctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
@@ -841,6 +835,11 @@ doveadm_cmdv2_wrapper_parse_common_options(struct doveadm_mail_cmd_context *mctx
                }
        }
 
+       if (doveadm_cmd_param_str(cctx, "socket-path",
+                                 &doveadm_settings->doveadm_socket_path) &&
+           doveadm_settings->doveadm_worker_count == 0)
+               doveadm_settings->doveadm_worker_count = 1;
+
        if (doveadm_cmd_param_istream(cctx, "file", &mctx->cmd_input))
                i_stream_ref(mctx->cmd_input);