From bb855e2094d14548fcbbae3be45e12924a4ec195 Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Wed, 23 Nov 2022 09:51:39 +0000 Subject: [PATCH] login-common: Fix for infinite recursion on invalid var expansion in login_log_format_elements and/or login_log_format Broken by 0a3997e1c64f48529338a9f93d7c39381dfe4f72 --- src/login-common/client-common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c index 48e7daf0d7..a6aaaaeb97 100644 --- a/src/login-common/client-common.c +++ b/src/login-common/client-common.c @@ -1027,8 +1027,7 @@ client_get_log_str(struct client *client, const char *msg) !expand_error_logged) { /* NOTE: Don't log via client->event - it would cause recursion */ - e_error(client->event, - "Failed to expand log_format_elements=%s: %s", + i_error("Failed to expand log_format_elements=%s: %s", *e, error); expand_error_logged = TRUE; } @@ -1065,8 +1064,7 @@ client_get_log_str(struct client *client, const char *msg) if (var_expand(str, client->set->login_log_format, tab, &error) <= 0) { /* NOTE: Don't log via client->event - it would cause recursion */ - e_error(client->event, - "Failed to expand login_log_format=%s: %s", + i_error("Failed to expand login_log_format=%s: %s", client->set->login_log_format, error); expand_error_logged = TRUE; } -- 2.47.3