From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 3 Feb 2019 22:33:36 +0000 (+0100)
Subject: lib-auth: auth-client - Add optional reason argument to auth_client_request_abort().
X-Git-Tag: 2.3.9~845
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9b4d8ff391149387ccbd69fd8d240fd91501e5;p=thirdparty%2Fdovecot%2Fcore.git

lib-auth: auth-client - Add optional reason argument to auth_client_request_abort().

It is not actually used yet in this commit.
---

diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c
index da9e0edaca..46d8075937 100644
--- a/src/lib-auth/auth-client-request.c
+++ b/src/lib-auth/auth-client-request.c
@@ -173,7 +173,8 @@ static void auth_client_request_free(struct auth_client_request **_request)
 	pool_unref(&request->pool);
 }
 
-void auth_client_request_abort(struct auth_client_request **_request)
+void auth_client_request_abort(struct auth_client_request **_request,
+			       const char *reason ATTR_UNUSED)
 {
 	struct auth_client_request *request = *_request;
 
diff --git a/src/lib-auth/auth-client.h b/src/lib-auth/auth-client.h
index 8ddb7b3a13..898d744961 100644
--- a/src/lib-auth/auth-client.h
+++ b/src/lib-auth/auth-client.h
@@ -107,7 +107,8 @@ auth_client_request_new(struct auth_client *client,
 void auth_client_request_continue(struct auth_client_request *request,
 				  const char *data_base64);
 /* Abort ongoing authentication request. */
-void auth_client_request_abort(struct auth_client_request **request);
+void auth_client_request_abort(struct auth_client_request **request,
+			       const char *reason) ATTR_NULL(2);
 /* Return ID of this request. */
 unsigned int auth_client_request_get_id(struct auth_client_request *request);
 /* Return the PID of the server that handled this request. */
diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index dedfb5b8f9..68944cc7e2 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -422,7 +422,7 @@ sasl_server_auth_cancel(struct client *client, const char *reason,
 
 	client->authenticating = FALSE;
 	if (client->auth_request != NULL)
-		auth_client_request_abort(&client->auth_request);
+		auth_client_request_abort(&client->auth_request, reason);
 
 	if (code != NULL) {
 		const char *args[2];