[exim-cvs] Fix $reccipients after ${run...}. Bug 2929

Commit:     6b331d5834d12bdda21857cd6fffac17038ce3c7
Parent:     221321d2c51b83d1feced80ecd6c2fe33ec5456c
Author:     Ruben Jenster <r.jenster@???>
AuthorDate: Thu Nov 3 21:38:15 2022 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Nov 3 21:38:15 2022 +0000

    Fix $reccipients after ${run...}.  Bug 2929

    Broken-by: cfe6acff2d
---
 doc/doc-txt/ChangeLog | 3 +++
 src/src/transport.c   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3942e25f0..290ca36b9 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -54,6 +54,9 @@ JH/12 Bug 2930: Fix daemon startup.  When started from any process apart from
       pid 1, in the normal "background daemon" mode, having to drop process-
       group leadership also lost track of needing to create listener sockets.

+JH/13 Bug 2929: Fix using $recipients after ${run...}.  A change made for 4.96
+      resulted in the variable appearing empty.  Find and fix by Ruben Jenster.
+

 Exim version 4.96
 -----------------
diff --git a/src/src/transport.c b/src/src/transport.c
index cce1c46ae..7477882cb 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2344,9 +2344,10 @@ if (expand_arguments)
     else
       {
       const uschar *expanded_arg;
+      BOOL enable_dollar_recipients_g = f.enable_dollar_recipients;
       f.enable_dollar_recipients = allow_dollar_recipients;
       expanded_arg = expand_cstring(argv[i]);
-      f.enable_dollar_recipients = FALSE;
+      f.enable_dollar_recipients = enable_dollar_recipients_g;

       if (!expanded_arg)
         {