lib-auth: Rename AUTH_REQUEST_FLAG_TRANSPORT_SECURITY_TLS to AUTH_REQUEST_FLAG_CONN_S...

diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c
index 9b931ecd7ff26ca85f359a495ad2241f731d5fd7..27493ac5e315c927cbcaf55ba81d332dda3e46b3 100644 (file)
--- a/src/lib-auth/auth-client-request.c
+++ b/src/lib-auth/auth-client-request.c
@@ -26,14 +26,14 @@ static void auth_server_send_new_request(struct auth_client_connection *conn,
                str_append(str, "\tfinal-resp-ok");
        if ((info->flags & AUTH_REQUEST_FLAG_CONN_SECURED) != 0) {
                str_append(str, "\tsecured");
-               if ((info->flags & AUTH_REQUEST_FLAG_TRANSPORT_SECURITY_TLS) != 0) {
+               if ((info->flags & AUTH_REQUEST_FLAG_CONN_SECURED_TLS) != 0) {
                        str_append(str, "=tls");
                        event_add_str(request->event, "transport", "TLS");
                } else {
                        event_add_str(request->event, "transport", "trusted");
                }
        } else {
-               i_assert((info->flags & AUTH_REQUEST_FLAG_TRANSPORT_SECURITY_TLS) == 0);
+               i_assert((info->flags & AUTH_REQUEST_FLAG_CONN_SECURED_TLS) == 0);
                event_add_str(request->event, "transport", "insecure");
        }
        if ((info->flags & AUTH_REQUEST_FLAG_NO_PENALTY) != 0)

diff --git a/src/lib-auth/auth-client.h b/src/lib-auth/auth-client.h
index 012041ddc2990be7402995fdb77a2a85d03e67ce..d94dece7b16bb5556cd32bc27b60a2eba2e60791 100644 (file)
--- a/src/lib-auth/auth-client.h
+++ b/src/lib-auth/auth-client.h
@@ -21,8 +21,8 @@ enum auth_request_flags {
        AUTH_REQUEST_FLAG_SUPPORT_FINAL_RESP    = 0x08,
        /* Enable auth_debug=yes logging for this request */
        AUTH_REQUEST_FLAG_DEBUG                 = 0x10,
-       /* If TLS was used */
-       AUTH_REQUEST_FLAG_TRANSPORT_SECURITY_TLS = 0x20,
+       /* Connection from the previous hop is secured by TLS. */
+       AUTH_REQUEST_FLAG_CONN_SECURED_TLS      = 0x20,
 };
 
 enum auth_request_status {

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index d1192829037861c6a1a79d04a115e2a97dd2a0c9..978edd9d0b0c437dbc6d6d33ff7b561f881e73d7 100644 (file)
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -107,7 +107,7 @@ client_get_auth_flags(struct client *client)
            ssl_iostream_has_valid_client_cert(client->ssl_iostream))
                auth_flags |= AUTH_REQUEST_FLAG_VALID_CLIENT_CERT;
        if (client->connection_tls_secured || client->haproxy_terminated_tls)
-               auth_flags |= AUTH_REQUEST_FLAG_TRANSPORT_SECURITY_TLS;
+               auth_flags |= AUTH_REQUEST_FLAG_CONN_SECURED_TLS;
        if (client->connection_secured)
                auth_flags |= AUTH_REQUEST_FLAG_CONN_SECURED;
        if (login_binary->sasl_support_final_reply)