lb-auth, auth: Change transport=trusted to transport=secured in event fields

Using "trusted" word here is wrong/confusing. Login process uses both
"trusted" and "secured" words in connections to mean different things.

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index 9ca5f2252970d739235229e2771fa534e38957e9..b69e64f2fb6081e17be32d13545704b29ab19dea 100644 (file)
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -217,7 +217,7 @@ bool auth_request_import_auth(struct auth_request *request,
                        event_add_str(request->event, "transport", "TLS");
                } else {
                        fields->conn_secured = AUTH_REQUEST_CONN_SECURED;
-                       event_add_str(request->event, "transport", "trusted");
+                       event_add_str(request->event, "transport", "secured");
                }
        }
        else if (strcmp(key, "final-resp-ok") == 0)

diff --git a/src/auth/test-auth-request-fields.c b/src/auth/test-auth-request-fields.c
index e43a1bf0f30daac92e42f2162968efcf7c29904c..6666edaaed389954124ffb94bdcfb0231de7b248 100644 (file)
--- a/src/auth/test-auth-request-fields.c
+++ b/src/auth/test-auth-request-fields.c
@@ -126,7 +126,7 @@ static void test_auth_request_fields_secured(void)
 
        test_assert(auth_request_import(request, "secured", ""));
        test_assert(test_auth_request_export_cmp(request, "secured", ""));
-       test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "trusted") == 0);
+       test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "secured") == 0);
 
        test_assert(auth_request_import(request, "secured", "tls"));
        test_assert(test_auth_request_export_cmp(request, "secured", "tls"));
@@ -134,7 +134,7 @@ static void test_auth_request_fields_secured(void)
 
        test_assert(auth_request_import(request, "secured", "blah"));
        test_assert(test_auth_request_export_cmp(request, "secured", ""));
-       test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "trusted") == 0);
+       test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "secured") == 0);
        test_auth_request_deinit(request);
 }
 

diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c
index 27493ac5e315c927cbcaf55ba81d332dda3e46b3..c9e9ba1f1e1c98429ef76950d56eb1ffd4c77599 100644 (file)
--- a/src/lib-auth/auth-client-request.c
+++ b/src/lib-auth/auth-client-request.c
@@ -30,7 +30,7 @@ static void auth_server_send_new_request(struct auth_client_connection *conn,
                        str_append(str, "=tls");
                        event_add_str(request->event, "transport", "TLS");
                } else {
-                       event_add_str(request->event, "transport", "trusted");
+                       event_add_str(request->event, "transport", "secured");
                }
        } else {
                i_assert((info->flags & AUTH_REQUEST_FLAG_CONN_SECURED_TLS) == 0);