]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
login-common: Rename var_expand_table variable to client_tab
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 6 Mar 2024 18:07:18 +0000 (20:07 +0200)
committerAki Tuomi <aki.tuomi@open-xchange.com>
Fri, 17 Jan 2025 08:39:58 +0000 (10:39 +0200)
Fixes a conflict caused by the next commit.

src/login-common/client-common.c

index cf80e60d55cffd43a43e2c59bbf24442b37c6834..f067c2d9e079ba2676808d43ce102502b3a8d1ec 100644 (file)
@@ -1195,19 +1195,19 @@ client_get_log_str(struct client *client, const char *msg)
                { NULL, NULL }
        };
        static bool expand_error_logged = FALSE;
-       const struct var_expand_table *var_expand_table;
+       const struct var_expand_table *client_tab;
        char *const *e;
        const char *error;
        string_t *str, *str2;
        unsigned int pos;
 
-       var_expand_table = get_var_expand_table(client);
+       client_tab = get_var_expand_table(client);
 
        str = t_str_new(256);
        str2 = t_str_new(128);
        for (e = client->set->log_format_elements_split; *e != NULL; e++) {
                pos = str_len(str);
-               if (var_expand_with_funcs(str, *e, var_expand_table,
+               if (var_expand_with_funcs(str, *e, client_tab,
                                          func_table, client, &error) <= 0 &&
                    !expand_error_logged) {
                        /* NOTE: Don't log via client->event - it would cause