Merge pull request #804 from openziti/ha-enrollment-1

fix HA enrollment: alternate controllers cannot be used for enrollment
openziti · Jan 8, 2025 · cd0b42b · cd0b42b
2 parents 47cd62d + b9f98cd
commit cd0b42b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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)

diff --git 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);