login-common: Rename client.auth_waiting to auth_client_continue_pending

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 96226f4804b242ea5601d116b3d90a2506b089c7..8a9945498816f1bfaf2868b260293f1d63fe7fa5 100644 (file)
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -800,7 +800,7 @@ client_auth_handle_reply(struct client *client,
 
 void client_auth_respond(struct client *client, const char *response)
 {
-       client->auth_waiting = FALSE;
+       client->auth_client_continue_pending = FALSE;
        client_set_auth_waiting(client);
        auth_client_request_continue(client->auth_request, response);
        if (!client_does_custom_io(client))
@@ -995,7 +995,7 @@ sasl_callback(struct client *client, enum sasl_server_reply sasl_reply,
                        str_truncate(client->auth_response, 0);
 
                i_assert(client->io == NULL);
-               client->auth_waiting = TRUE;
+               client->auth_client_continue_pending = TRUE;
                if (!client_does_custom_io(client)) {
                        client->io = io_add_istream(client->input,
                                                    client_auth_input, client);

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index d3032293ddfaa52069124a4eb930037004ed94d4..c551e701f02d4042fc73dee0454d202fca300b41 100644 (file)
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -1137,7 +1137,7 @@ const char *client_get_extra_disconnect_reason(struct client *client)
            client->ssl_iostream == NULL)
                return "(cert required, client didn't start TLS)";
 
-       if (client->auth_waiting && client->auth_attempts == 1) {
+       if (client->auth_client_continue_pending && client->auth_attempts == 1) {
                return t_strdup_printf("(client didn't finish SASL auth, "
                                       "waited %u secs)", auth_secs);
        }

diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 4315f5a613da158681f9cac9f57590a1dcc7696f..c55c9b74ffbbe062ff97b56edf8b20a1280c9012 100644 (file)
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -258,6 +258,8 @@ struct client {
        bool ssl_servername_settings_read:1;
        bool banner_sent:1;
        bool authenticating:1;
+       /* SASL authentication is waiting for client to send a continuation */
+       bool auth_client_continue_pending:1;
        bool auth_try_aborted:1;
        bool auth_initializing:1;
        bool auth_process_comm_fail:1;
@@ -268,7 +270,6 @@ struct client {
        bool proxy_nopipelining:1;
        bool proxy_not_trusted:1;
        bool proxy_redirect_reauth:1;
-       bool auth_waiting:1;
        bool notified_auth_ready:1;
        bool notified_disconnect:1;
        bool fd_proxying:1;

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index 4d458777595aec6f3d91b06e795670af80e72fd7..2f02458336078a522aeed1d1468dd234b399e3c4 100644 (file)
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -334,7 +334,7 @@ authenticate_callback(struct auth_client_request *request,
                i_assert(status < 0);
                return;
        }
-       client->auth_waiting = FALSE;
+       client->auth_client_continue_pending = FALSE;
 
        i_assert(client->auth_request == request);
        switch (status) {