4211. [bug] Ensure that lwresd gets at least one task to work

                        with if enabled. [RT #40652]

diff --git a/CHANGES b/CHANGES
index 00e9c039aa3e6ceacdc99a11bc065fe1af8746ee..edf9ef9797440230de223403e118ac339ae43b7f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4211.  [bug]           Ensure that lwresd gets at least one task to work
+                       with if enabled. [RT #40652]
+
 4210.  [cleanup]       Silence use after free false positive. [RT #40743]
 
 4209.  [bug]           Address resource leaks in dlz modules. [RT #40654]

diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index 17c003ba6ed94be1b503917d0d3ae482bf47bbc2..694affe257166602a96a60c65647285e521ebab1 100644 (file)
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -398,6 +398,9 @@ ns_lwdmanager_create(isc_mem_t *mctx, const cfg_obj_t *lwres,
        else
                lwresd->ntasks = ns_g_cpus;
 
+       if (lwresd->ntasks == 0)
+               lwresd->ntasks = 1;
+
        obj = NULL;
        (void)cfg_map_get(lwres, "lwres-clients", &obj);
        if (obj != NULL) {
@@ -638,7 +641,8 @@ listener_startclients(ns_lwreslistener_t *listener) {
        }
 
        /*
-        * Ensure that we have created at least one.
+        * If the list is empty return now with the previous
+        * ns_lwdclientmgr_create() result.
         */
        if (ISC_LIST_EMPTY(listener->cmgrs))
                return (result);