]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: acme: remove remaining CLI wait in ACME_RSLV_TRIGGER
authorWilliam Lallemand <wlallemand@haproxy.com>
Thu, 2 Apr 2026 16:23:35 +0000 (18:23 +0200)
committerWilliam Lallemand <wlallemand@haproxy.com>
Thu, 2 Apr 2026 16:23:35 +0000 (18:23 +0200)
The TASK_WOKEN_TIMER check that previously handled the case where
RSLV_TRIGGER was reached directly from the CLI command is therefore dead
code and can be removed.

src/acme.c

index 1c656169916a56e084163a171bbb12093a1f6ac3..0eea8a754e04ac646518b26acadd81210b00e107 100644 (file)
@@ -2462,28 +2462,6 @@ re:
                         * the timeout */
                        if (ctx->dnsstarttime == 0)
                                 ctx->dnsstarttime = ns_to_sec(now_ns);
-
-                       /* if it was trigger by the CLI, still wait dns_delay if
-                        * not everything is ready, or skip and to to
-                        * ACME_CHALLENGE */
-                       if (!(state & TASK_WOKEN_TIMER)) {
-                               int all_ready = 1;
-
-                               for (auth = ctx->auths; auth != NULL; auth = auth->next) {
-                                       if (auth->ready == ctx->cfg->cond_ready)
-                                               continue;
-                                       all_ready = 0;
-                               }
-                               if (all_ready) {
-                                       st = ACME_CHALLENGE;
-                                       ctx->http_state = ACME_HTTP_REQ;
-                                       ctx->state = st;
-                                       goto nextreq;
-                               } else {
-                                       return task;
-                               }
-                       }
-
                        /* on timer expiry, re-trigger resolution for non-ready auths */
                        for (auth = ctx->auths; auth != NULL; auth = auth->next) {
                                if (auth->ready == ctx->cfg->cond_ready)