From c7769c138e23836dc162972ff52fa41aa3fd9f54 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 3 Dec 2016 23:07:12 +0000 Subject: [PATCH] Testsuite: ensure delivery order --- test/confs/0570 | 1 + test/log/0570 | 104 +++++++++++++++++++++-------------- test/rejectlog/0570 | 24 ++++---- test/scripts/0000-Basic/0570 | 30 ++++++---- 4 files changed, 95 insertions(+), 64 deletions(-) diff --git a/test/confs/0570 b/test/confs/0570 index 1c2ca0a25..962e76bb0 100644 --- a/test/confs/0570 +++ b/test/confs/0570 @@ -36,5 +36,6 @@ smtp: driver = smtp port = PORT_D OPTION + max_parallel = 1 # End diff --git a/test/log/0570 b/test/log/0570 index fa76b71f1..3630b692a 100644 --- a/test/log/0570 +++ b/test/log/0570 @@ -1,43 +1,58 @@ -**NOTE: The delivery lines in this file have been sorted. 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domd.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@dome.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domf.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmbE-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@domg.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" +1999-03-02 09:44:33 10HmbE-0005vi-00 -> usery@domh.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00" 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbH-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" -1999-03-02 09:44:33 10HmbH-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00" -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@domk.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp -1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbG-0005vi-00 => usery@doml.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00" +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbK-0005vi-00 -> usery@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 => userz@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbM-0005vi-00" -1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@domm.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbJ-0005vi-00 => usery@domn.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00" +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbM-0005vi-00 => userx@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 10HmbM-0005vi-00 -> usery@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmbM-0005vi-00 => userz@domq.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-0005vi-00" +1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 @@ -46,41 +61,46 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbG-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbG-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbH-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbJ-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbK-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbK-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex -1999-03-02 09:44:33 10HmbM-0005vi-00 => blackhole (RCPT ACL discarded recipients) -1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbN-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbN-0005vi-00 Completed +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex +1999-03-02 09:44:33 10HmbO-0005vi-00 => blackhole (RCPT ACL discarded recipients) +1999-03-02 09:44:33 10HmbO-0005vi-00 Completed diff --git a/test/rejectlog/0570 b/test/rejectlog/0570 index a1acc1559..63f236a55 100644 --- a/test/rejectlog/0570 +++ b/test/rejectlog/0570 @@ -2,14 +2,16 @@ ******** SERVER ******** 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL diff --git a/test/scripts/0000-Basic/0570 b/test/scripts/0000-Basic/0570 index 75ac0cec6..8f8c0b2da 100644 --- a/test/scripts/0000-Basic/0570 +++ b/test/scripts/0000-Basic/0570 @@ -12,7 +12,7 @@ exim -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domC.ex usery@domD.ex Test message **** # Equivalent explicit case: can multi-domain @@ -20,14 +20,17 @@ exim -DOPTION=multi_domain=yes -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domE.ex usery@domF.ex Test message **** -# no multi-domain +# no multi-domain: 2nd rcpt is deferred since parallel is disabled exim -DOPTION=multi_domain=no -q +**** +exim -DOPTION=multi_domain=no -qf +**** # # -exim userx@domA.ex usery@domB.ex +exim userx@domG.ex usery@domH.ex Test message **** # Expanded case: can multi-domain @@ -35,33 +38,38 @@ exim -DOPTION='multi_domain=${if bool{1} {true}{false}}' -q **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domK.ex usery@domL.ex Test message **** # Expanded case: no multi-domain (1) -exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -qf **** # # -exim userx@domA.ex usery@domB.ex +exim userx@domM.ex usery@domN.ex Test message **** # Expanded case: no multi-domain (2) -exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domB.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -qf **** # # -exim userx@domA.ex usery@domA.ex userz@domC.ex +exim userx@domP.ex usery@domP.ex userz@domQ.ex Test message **** # Expanded case: both yes and no -exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q +exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -q +**** +exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -qf **** # # killdaemon no_msglog_check -sortlog # # ## -- 2.30.2