From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 23 Jun 2022 16:39:57 +0000 (+0300)
Subject: login-common: Fix forward_ fields handling with reauth requests
X-Git-Tag: 2.4.0~3777
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6aa9ae6cc70b9151b0f94effbe70bfea6687c5be;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Fix forward_ fields handling with reauth requests
---

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index ecb2de0813..5e6f1de255 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -404,6 +404,9 @@ proxy_redirect_reauth_callback(struct auth_client_request *request,
 			break;
 		}
 
+		/* Replace the saved passdb args with the reauth reply. This
+		   way reauth can replace (all of) the forward_* fields. */
+		client->auth_passdb_args = p_strarray_dup(client->pool, args);
 		if (reply.proxy.proxy) {
 			login_proxy_redirect_finish(client->login_proxy,
 						    &reply.proxy.host_ip,