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

Broken-by: cfe6acff2d

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3942e25f0f7b349c4791f65696707ca29863f7ec..290ca36b93bf2ba077d16ca486b6ed94631f38dc 100644 (file)
--- 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.
 
       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
 -----------------
 
 Exim version 4.96
 -----------------

diff --git a/src/src/transport.c b/src/src/transport.c
index cce1c46aecbcee6122bf7b731b75830d87d42958..7477882cb9565128809f9f4ece4a2cd10efe7a24 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2344,9 +2344,10 @@ if (expand_arguments)
     else
       {
       const uschar *expanded_arg;
     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 = 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)
         {
 
       if (!expanded_arg)
         {