From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 24 Jun 2023 20:41:10 +0000 (+0300)
Subject: lib-auth-client, global: Rename auth_request_info.service to protocol
X-Git-Tag: 2.4.1~1542
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2fefc2a8d9b466e594cfaf9c65d3ee34ad40960;p=thirdparty%2Fdovecot%2Fcore.git

lib-auth-client, global: Rename auth_request_info.service to protocol
---

diff --git a/src/auth/test-auth-client.c b/src/auth/test-auth-client.c
index 6229e4d6f3..4d3fd8784e 100644
--- a/src/auth/test-auth-client.c
+++ b/src/auth/test-auth-client.c
@@ -55,7 +55,7 @@ static void test_auth_client(void)
 	struct auth_request_info reqinfo = {
 		.mech = "plain",
 		.client_id = "1",
-		.service = "default",
+		.protocol = "default",
 		.session_id = "1",
 	};
 	(void)auth_client_request_new(client, &reqinfo, test_callback, client);
diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index 7e91307dc5..7b769fa9c7 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -262,7 +262,7 @@ static void auth_connected(struct auth_client *client,
 
 	i_zero(&info);
 	info.mech = mech;
-	info.service = input->info.service;
+	info.protocol = input->info.service;
 	info.session_id = input->info.session_id;
 	info.local_name = input->info.local_name;
 	info.local_ip = input->info.local_ip;
diff --git a/src/lib-auth-client/auth-client-request.c b/src/lib-auth-client/auth-client-request.c
index ee278739c3..5330a3a6cc 100644
--- a/src/lib-auth-client/auth-client-request.c
+++ b/src/lib-auth-client/auth-client-request.c
@@ -27,10 +27,10 @@ auth_server_send_new_request(struct auth_client_connection *conn,
 	str_printfa(str, "AUTH\t%u\t", request->id);
 	str_append_tabescaped(str, info->mech);
 	str_append(str, "\tservice=");
-	str_append_tabescaped(str, info->service);
+	str_append_tabescaped(str, info->protocol);
 
 	event_add_str(request->event, "mechanism", info->mech);
-	event_add_str(request->event, "protocol", info->service);
+	event_add_str(request->event, "protocol", info->protocol);
 
 	str_append(str, "\tfinal-resp-ok");
 	if ((info->flags & AUTH_REQUEST_FLAG_CONN_SECURED) != 0) {
diff --git a/src/lib-auth-client/auth-client.h b/src/lib-auth-client/auth-client.h
index 236e97648d..c625577c37 100644
--- a/src/lib-auth-client/auth-client.h
+++ b/src/lib-auth-client/auth-client.h
@@ -45,7 +45,7 @@ struct auth_connect_id {
 
 struct auth_request_info {
 	const char *mech;
-	const char *service;
+	const char *protocol;
 	const char *session_id;
 	const char *cert_username;
 	const char *local_name;
diff --git a/src/lib-auth-client/test-auth-client.c b/src/lib-auth-client/test-auth-client.c
index 47dd756fe6..18c193919c 100644
--- a/src/lib-auth-client/test-auth-client.c
+++ b/src/lib-auth-client/test-auth-client.c
@@ -1001,7 +1001,7 @@ test_client_auth_parallel(const char *mech, const char *username,
 
 	i_zero(&info);
 	info.mech = mech;
-	info.service = "test";
+	info.protocol = "test";
 	info.session_id = "23423dfd243daaa223";
 	info.flags = AUTH_REQUEST_FLAG_CONN_SECURED;
 
diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index 4dd3bb7c93..efad47c32b 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -466,7 +466,7 @@ int sasl_server_auth_request_info_fill(struct client *client,
 	const char *error;
 
 	i_zero(info_r);
-	info_r->service = login_binary->protocol;
+	info_r->protocol = login_binary->protocol;
 	info_r->session_id = client_get_session_id(client);
 
 	if (!get_cert_username(client, &info_r->cert_username, &error)) {