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 6229e4d6f3c7022dd58e26d2707e4c12a49a37f9..4d3fd8784eaa31074e01a1229455a0f8665a2df5 100644 (file)
--- 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 7e91307dc5a3adb912784fe2cd1e1e8b1643254f..7b769fa9c711f1ff9d1419e91b1d73ea999bae9d 100644 (file)
--- 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 ee278739c331508401d5011cac035815475e418a..5330a3a6cc38386b1e7e010e4508e0b389c95c46 100644 (file)
--- 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 236e97648d9d86e8b8bcae2b6ec9171e3736d2bc..c625577c37b7beafabcf04e69c1c847041bae9d3 100644 (file)
--- 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 47dd756fe66532d5e21188dd013b5a331825f56b..18c193919cef3a19b8b77df62d8fd2428a281950 100644 (file)
--- 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 4dd3bb7c9342ec6a4e952ca88209e6e3fb024714..efad47c32bf9d857ddba19031178e84d574b979f 100644 (file)
--- 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)) {