- Fix to not skip allow-notify hostname lookups when there are only

  urls.

diff --git a/doc/Changelog b/doc/Changelog
index 18ee3f87807a565682cfaa6a99ae3a50f26194a2..92256daddd3d0938a7fc5466e1fac532a6d3c876 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 26 January 2026: Wouter
        - Fix that allow-notify entries with hostnames are copied after IPv4
          and IPv6 lookup.
+       - Fix to not skip allow-notify hostname lookups when there are only
+         urls.
 
 23 January 2026: Yorgos
        - Merge #1396: Log Linux thread ID.

diff --git a/services/authzone.c b/services/authzone.c
index daffef73897a3aa89e6a934205dedab131895e99..3965b5e171801717ed967e3d893ee580422eb75c 100644 (file)
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -6695,6 +6695,18 @@ xfr_probe_lookup_host(struct auth_xfer* xfr, struct module_env* env)
        return 1;
 }
 
+/** return true if there are probe (SOA UDP query) targets in the master list*/
+static int
+have_probe_targets(struct auth_master* list)
+{
+       struct auth_master* p;
+       for(p=list; p; p = p->next) {
+               if(!p->allow_notify && p->host)
+                       return 1;
+       }
+       return 0;
+}
+
 /** move to sending the probe packets, next if fails. task_probe */
 static void
 xfr_probe_send_or_end(struct auth_xfer* xfr, struct module_env* env)
@@ -6734,6 +6746,16 @@ xfr_probe_send_or_end(struct auth_xfer* xfr, struct module_env* env)
                        verbose(VERB_ALGO, "auth zone %s probe: finished only_lookup", zname);
                }
                xfr_probe_disown(xfr);
+               if(!have_probe_targets(xfr->task_probe->masters)) {
+                       /* If there are no masters to probe, go to transfer. */
+                       if(xfr->task_transfer->worker == NULL) {
+                               xfr_start_transfer(xfr, env, NULL);
+                               return;
+                       }
+                       /* The transfer is already in progress. */
+                       lock_basic_unlock(&xfr->lock);
+                       return;
+               }
                if(xfr->task_nextprobe->worker == NULL)
                        xfr_set_timeout(xfr, env, 0, 0);
                lock_basic_unlock(&xfr->lock);
@@ -6890,18 +6912,6 @@ auth_xfer_timer(void* arg)
        }
 }
 
-/** return true if there are probe (SOA UDP query) targets in the master list*/
-static int
-have_probe_targets(struct auth_master* list)
-{
-       struct auth_master* p;
-       for(p=list; p; p = p->next) {
-               if(!p->allow_notify && p->host)
-                       return 1;
-       }
-       return 0;
-}
-
 /** start task_probe if possible, if no masters for probe start task_transfer
  * returns true if task has been started, and false if the task is already
  * in progress. */
@@ -6913,7 +6923,9 @@ xfr_start_probe(struct auth_xfer* xfr, struct module_env* env,
         * progress (due to notify)) */
        if(xfr->task_probe->worker == NULL) {
                if(!have_probe_targets(xfr->task_probe->masters) &&
-                       !(xfr->task_probe->only_lookup &&
+                       xfr->task_probe->masters != NULL)
+                       xfr->task_probe->only_lookup = 1;
+               if(!(xfr->task_probe->only_lookup &&
                        xfr->task_probe->masters != NULL)) {
                        /* useless to pick up task_probe, no masters to
                         * probe. Instead attempt to pick up task transfer */