From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 21 Oct 2023 00:05:28 +0000 (+0200)
Subject: auth: auth-request-fields - Use sasl-server API to obtain mechanism name
X-Git-Tag: 2.4.2~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a7024849cfbade97e53bcb28ae0995d1c488ce1;p=thirdparty%2Fdovecot%2Fcore.git

auth: auth-request-fields - Use sasl-server API to obtain mechanism name
---

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index c86b3f7c87..0c3383af14 100644
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -7,7 +7,6 @@
 #include "strescape.h"
 #include "str-sanitize.h"
 #include "base64.h"
-#include "sasl-server-protected.h" // FIXME: remove
 #include "auth-request.h"
 
 void auth_request_fields_alloc(struct auth_request *request)
@@ -19,10 +18,11 @@ void auth_request_fields_alloc(struct auth_request *request)
 
 void auth_request_fields_init(struct auth_request *request)
 {
-	if (request->mech != NULL) {
-		request->fields.mech_name = request->mech->name;
+	if (request->sasl.req.mech != NULL) {
+		request->fields.mech_name =
+			sasl_server_mech_get_name(request->sasl.req.mech);
 		event_add_str(request->event, "mechanism",
-			      request->mech->name);
+			      request->fields.mech_name);
 	}
 }