lib-auth: auth-client - Add optional reason argument to auth_client_r…

…equest_abort(). It is not actually used yet in this commit.
dovecot · Feb 3, 2019 · ae9b4d8 · ae9b4d8
1 parent a91862d
commit ae9b4d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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];