doveadm fs: Use mail_temp_dir as temp_dir for fs operations' temp_dir

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index 73e11d30703f3d61ade232f4effb42fe81ab75fc..7dde6118b4df6db8168700470e35a461d3045904 100644 (file)
--- a/src/doveadm/doveadm-fs.c
+++ b/src/doveadm/doveadm-fs.c
@@ -47,7 +47,7 @@ cmd_fs_init(int *argc, char **argv[], int own_arg_count, doveadm_command_t *cmd)
        ssl_set.verbose = doveadm_debug;
        i_zero(&fs_set);
        fs_set.ssl_client_set = &ssl_set;
-       fs_set.temp_dir = "/tmp";
+       fs_set.temp_dir = doveadm_settings->mail_temp_dir;
        fs_set.base_dir = doveadm_settings->base_dir;
        fs_set.debug = doveadm_debug;
 

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index e0089d384d110df23da2718eddceca2317c78d88..ba6a5d0a4a959936eeab9528d3be869c890e54f5 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -60,6 +60,7 @@ static const struct setting_define doveadm_setting_defines[] = {
        DEF(SET_STR, libexec_dir),
        DEF(SET_STR, mail_plugins),
        DEF(SET_STR, mail_plugin_dir),
+       DEF(SET_STR_VARS, mail_temp_dir),
        DEF(SET_BOOL, auth_debug),
        DEF(SET_STR, auth_socket_path),
        DEF(SET_STR, doveadm_socket_path),
@@ -88,6 +89,7 @@ const struct doveadm_settings doveadm_default_settings = {
        .libexec_dir = PKG_LIBEXECDIR,
        .mail_plugins = "",
        .mail_plugin_dir = MODULEDIR,
+       .mail_temp_dir = "/tmp",
        .auth_debug = FALSE,
        .auth_socket_path = "auth-userdb",
        .doveadm_socket_path = "doveadm-server",

diff --git a/src/doveadm/doveadm-settings.h b/src/doveadm/doveadm-settings.h
index 365b0e515e8d26c66d55e95c6865989860202bc6..7b9f04fe0e0468f4a0aac4365963dfe211f3f2b5 100644 (file)
--- a/src/doveadm/doveadm-settings.h
+++ b/src/doveadm/doveadm-settings.h
@@ -14,6 +14,7 @@ struct doveadm_settings {
        const char *libexec_dir;
        const char *mail_plugins;
        const char *mail_plugin_dir;
+       const char *mail_temp_dir;
        bool auth_debug;
        const char *auth_socket_path;
        const char *doveadm_socket_path;