From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 8 Jan 2024 16:01:55 +0000 (+0000)
Subject: Fix recipient (or source) selection in combination with periodic queue run. Bug 3064
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/15851896ef1507c0901a4150fd869cbce6c17e3d

Fix recipient (or source) selection in combination with periodic queue run. Bug 3064

Broken-by: 1e835086d159
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index c745d4228..6a0207f2a 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -79,6 +79,10 @@ JH/15 Bug 3061: Ensure a log line is written for a malformed address in a
 JH/16 Two-phase queue runs are now reported in the daemon startup log line and
       in exiwhat output.
 
+JH/17 Bug 3064: Fix combination of "-q<period> -R <recipients>". Introduction of
+      the multiple-queue-runners facility for 4.97 broking this, giving only
+      a one-time run of the queue.
+
 
 Exim version 4.97
 -----------------
diff --git a/src/src/exim.c b/src/src/exim.c
index 4473373b3..c53b98186 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3688,7 +3688,7 @@ on the second character (the one after '-'), to save some effort. */
     in all cases provided there are no further characters in this
     argument. */
 
-      alloc_onetime_qrunner();
+      if (!qrunners) alloc_onetime_qrunner();
       qrunners->queue_2stage = f.queue_2stage;
       if (*argrest)
 	for (int i = 0; i < nelem(rsopts); i++)