diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-05-12 15:01:12 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-05-12 17:42:52 +0100 |
| commit | c1faf04b865465894c7ca41ab4585fb69d4a5936 (patch) | |
| tree | 28e0a764207c4991e3d67972291c8f94bf61b782 | |
| parent | e3311bc211d20617d90e75ea8ec7e01e6210483d (diff) | |
| download | exim4-c1faf04b865465894c7ca41ab4585fb69d4a5936.tar.gz | |
Named Queues: fix immediate-delivery. Bug 2743
(cherry picked from commit 159cf206c97f876b07829d92db2217689745c1e8)
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/exim.c | 6 | ||||
| -rw-r--r-- | test/confs/0576 | 6 | ||||
| -rw-r--r-- | test/log/0576 | 3 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0576 | 4 |
5 files changed, 21 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 9f104b4e6..e60c1cad5 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -223,6 +223,10 @@ QS/04 Always die if requested from internal logging, even is logging is JH/52 Fix ${ip6norm:} operator. Previously, any trailing line text was dropped, making it unusable in complex expressions. +JH/53 Bug 2743: fix immediate-delivery via named queue. Previously this would + fail with a taint-check on the spoolfile name, and leave the message + queued. + Exim version 4.94 ----------------- diff --git a/src/src/exim.c b/src/src/exim.c index ee75739ec..7411f0467 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -2789,9 +2789,11 @@ on the second character (the one after '-'), to save some effort. */ else badarg = TRUE; break; - /* -MCG: set the queue name, to a non-default value */ + /* -MCG: set the queue name, to a non-default value. Arguably, anything + from the commandline should be tainted - but we will need an untainted + value for the spoolfile when doing a -odi delivery process. */ - case 'G': if (++i < argc) queue_name = string_copy_taint(exim_str_fail_toolong(argv[i], EXIM_DRIVERNAME_MAX, "-MCG"), TRUE); + case 'G': if (++i < argc) queue_name = string_copy_taint(exim_str_fail_toolong(argv[i], EXIM_DRIVERNAME_MAX, "-MCG"), FALSE); else badarg = TRUE; break; diff --git a/test/confs/0576 b/test/confs/0576 index 5b023d280..3c0a4f830 100644 --- a/test/confs/0576 +++ b/test/confs/0576 @@ -7,6 +7,8 @@ SERVER = log_selector = +received_recipients +sender_on_delivery acl_smtp_rcpt = rcpt +acl_not_smtp_start = not_smtp + queue_only queue_run_in_order @@ -19,6 +21,10 @@ rcpt: queue = ${if eq {normal}{$local_part} {} {${bless:$local_part}}} logwrite = using queue '$queue_name' +not_smtp: + accept + queue = example + #--------------- begin routers diff --git a/test/log/0576 b/test/log/0576 index 246b10578..ddc28f932 100644 --- a/test/log/0576 +++ b/test/log/0576 @@ -28,6 +28,9 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 moved from (alternate) input, msglog to (third) input, msglog 1999-03-02 09:44:33 10HmbB-0005vi-00 moved from (third) input, msglog to input, msglog 1999-03-02 09:44:33 10HmbC-0005vi-00 moved from (third) input, msglog to input, msglog +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss Q=example for q_set_by_nonsmtp_acl@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 => q_set_by_nonsmtp_acl <q_set_by_nonsmtp_acl@test.ex> F=<CALLER@the.local.host.name> Q=example R=all T=dump +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -qGlowpri/3s, not listening for SMTP diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576 index ddf17f8d9..0f9a8c702 100644 --- a/test/scripts/0000-Basic/0576 +++ b/test/scripts/0000-Basic/0576 @@ -119,4 +119,8 @@ exim -bp -qGalternate exim -bp -qGthird **** # +# Immediate delivery, via alternate queue +exim -odi q_set_by_nonsmtp_acl@test.ex +**** +# no_stderr_check |