doveadm: Read settings with service=doveadm

This was done for mail commands while initializing the mail user, but
other commands weren't using it. This meant that doveadm was using only
global settings instead of protocol doveadm { .. } settings for everything
except mail commands.

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index f401a5c282bf49a157c8574f26862d820f2271de..67a8034238c7bb1ebc3398eef79e6313deab9032 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -255,6 +255,7 @@ static void doveadm_read_settings(void)
        memset(&input, 0, sizeof(input));
        input.roots = set_roots;
        input.module = "doveadm";
+       input.service = "doveadm";
        input.preserve_user = TRUE;
        input.preserve_home = TRUE;
        if (master_service_settings_read(master_service, &input,

diff --git a/src/doveadm/main.c b/src/doveadm/main.c
index dad5781f20baa2928262b6e7724f643536dc86af..0b303596df9d2bad5a3b6e030f040fbdd85aa1e0 100644 (file)
--- a/src/doveadm/main.c
+++ b/src/doveadm/main.c
@@ -104,6 +104,8 @@ int main(int argc, char *argv[])
        };
        enum master_service_flags service_flags =
                MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
+       struct master_service_settings_input input;
+       struct master_service_settings_output output;
        const char *error;
        int c;
 
@@ -120,8 +122,13 @@ int main(int argc, char *argv[])
                }
        }
 
-       if (master_service_settings_read_simple(master_service, set_roots,
-                                               &error) < 0)
+       memset(&input, 0, sizeof(input));
+       input.roots = set_roots;
+       input.module = "doveadm";
+       input.service = "doveadm";
+
+       if (master_service_settings_read(master_service, &input, &output,
+                                        &error) < 0)
                i_fatal("Error reading configuration: %s", error);
 
        master_service_init_log(master_service, "doveadm: ");