From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 30 Oct 2023 00:34:56 +0000 (+0100)
Subject: auth: sasl-server-request - Remove struct auth_request field from mechanism request... 
X-Git-Tag: 2.4.2~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc1cd5104032f6f9008b40401143b75ae78bc30b;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server-request - Remove struct auth_request field from mechanism request struct

It is no longer needed.
---

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 25d2b3b04f..19a044e3d4 100644
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -5,7 +5,6 @@
 
 #include "sasl-server.h"
 
-struct auth_request;
 struct sasl_server_mech_funcs;
 struct sasl_server_mech_def;
 struct sasl_server_mech_data;
@@ -73,9 +72,6 @@ struct sasl_server_mech_request {
 	const char *realm;
 
 	const struct sasl_server_settings *set;
-
-	// FIXME: To be removed
-	struct auth_request *request;
 };
 
 /*
diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index 5f434130e0..dbd79d0486 100644
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -1,7 +1,6 @@
 /* Copyright (c) 2023 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
-#include "auth-request.h"
 
 #include "sasl-server-private.h"
 
@@ -16,8 +15,6 @@ void sasl_server_request_create(struct sasl_server_req_ctx *rctx,
 {
 	struct sasl_server_instance *sinst = mech->sinst;
 	struct sasl_server *server = sinst->server;
-	struct auth_request *request =
-		container_of(rctx, struct auth_request, sasl.req);
 	struct sasl_server_request *req;
 	pool_t pool;
 
@@ -55,7 +52,6 @@ void sasl_server_request_create(struct sasl_server_req_ctx *rctx,
 		mreq = p_new(pool, struct sasl_server_mech_request, 1);
 	mreq->pool = pool;
 	mreq->req = req;
-	mreq->request = request;
 	mreq->set = &sinst->set;
 	mreq->mech = mech;
 	mreq->mech_event = req->event;