lda: main: main(): Put result from mail_user_var_expand_table() in a variable.

Keeps code more compact, as this function is going to be called several times.

diff --git a/src/lda/main.c b/src/lda/main.c
index 6b0b3232e9cf9b4a70e5ca7f8c21c7692242ee02..aacf9ed278d9598521db7da9918130048fb34d65 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -278,6 +278,7 @@ int main(int argc, char *argv[])
        struct mail_storage_service_ctx *storage_service;
        struct mail_storage_service_user *service_user;
        struct mail_storage_service_input service_input;
+       const struct var_expand_table *var_table;
        struct mail_storage *storage;
        const char *user_source = "", *destaddr_source = "";
        uid_t process_euid;
@@ -428,10 +429,10 @@ int main(int argc, char *argv[])
 #ifdef SIGXFSZ
         lib_signals_ignore(SIGXFSZ, TRUE);
 #endif
+       var_table = mail_user_var_expand_table(ctx.dest_user);
        lda_set = mail_storage_service_user_get_set(service_user)[1];
        if (settings_var_expand(&lda_setting_parser_info, lda_set,
-                               ctx.dest_user->pool,
-                               mail_user_var_expand_table(ctx.dest_user),
+                               ctx.dest_user->pool, var_table,
                                &errstr) <= 0)
                i_fatal("Failed to expand settings: %s", errstr);
        ctx.set = lda_set;