From 15851896ef1507c0901a4150fd869cbce6c17e3d Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 8 Jan 2024 16:01:55 +0000 Subject: [PATCH] Fix recipient (or source) selection in combination with periodic queue run. Bug 3064 Broken-by: 1e835086d159 --- doc/doc-txt/ChangeLog | 4 ++++ src/src/exim.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 -R ". 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++) -- 2.30.2