From 55f303e061ed253b9798863a5c112724d1f509fc Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 8 Jan 2025 14:17:23 -0500 Subject: [PATCH 1/2] fix HA enrollment: alternate controllers cannot be used -- JWT won't validate using alternate controllers will be implemented once controllers support it --- library/ziti_enroll.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/library/ziti_enroll.c b/library/ziti_enroll.c index 5df6245d..d87e648d 100644 --- a/library/ziti_enroll.c +++ b/library/ziti_enroll.c @@ -240,10 +240,6 @@ static int start_enrollment(struct ziti_enroll_req *er) { er->cfg.controller_url = strdup(er->enrollment.controller); model_list_append(&er->cfg.controllers, strdup(er->enrollment.controller)); - const char* ctrl; - MODEL_LIST_FOREACH(ctrl, er->enrollment.controllers) { - model_list_append(&er->cfg.controllers, strdup(ctrl)); - } ziti_ctrl_init(er->loop, &er->controller, &er->cfg.controllers, er->tls); ziti_ctrl_get_well_known_certs(&er->controller, well_known_certs_cb, er); From b9f98cdb8cdef7fe2e36cb90018f397be7f67444 Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 8 Jan 2025 14:24:38 -0500 Subject: [PATCH 2/2] update tlsuv@v0.33.2 --- deps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 3e62e0e1..667e00cb 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -9,7 +9,7 @@ if (NOT TARGET tlsuv) else () FetchContent_Declare(tlsuv GIT_REPOSITORY https://github.com/openziti/tlsuv.git - GIT_TAG v0.33.1 + GIT_TAG v0.33.2 ) FetchContent_MakeAvailable(tlsuv) endif (tlsuv_DIR)