X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cfe6acff2ddc7eb03b3489770219edf829abd323..a85c067ba6c6940512cf57ec213277a370d87e70:/src/src/transport.c

diff --git a/src/src/transport.c b/src/src/transport.c
index 105238c9c..ff2e0b1d4 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2,9 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 /* General functions concerned with transportation, and generic options for all
 transports. */
@@ -782,7 +783,7 @@ for (header_line * h = header_list; h; h = h->next) if (h->type != htype_old)
   /* Header removed */
 
   else
-    DEBUG(D_transport) debug_printf("removed header line:\n%s---\n", h->text);
+    DEBUG(D_transport) debug_printf("removed header line:\n %s---\n", h->text);
   }
 
 /* Add on any address-specific headers. If there are multiple addresses,
@@ -798,8 +799,8 @@ Headers added to an address by a router are guaranteed to end with a newline.
 
 if (addr)
   {
-  header_line *hprev = addr->prop.extra_headers;
-  header_line *hnext, * h;
+  header_line * hprev = addr->prop.extra_headers, * hnext, * h;
+
   for (int i = 0; i < 2; i++)
     for (h = hprev, hprev = NULL; h; h = hnext)
       {
@@ -810,7 +811,7 @@ if (addr)
 	{
 	if (!sendfn(tctx, h->text, h->slen)) return FALSE;
 	DEBUG(D_transport)
-	  debug_printf("added header line(s):\n%s---\n", h->text);
+	  debug_printf("added header line(s):\n %s---\n", h->text);
 	}
       }
   }
@@ -838,7 +839,7 @@ if (tblock && (list = CUS tblock->add_headers))
 	  return FALSE;
 	DEBUG(D_transport)
 	  {
-	  debug_printf("added header line:\n%s", s);
+	  debug_printf("added header line:\n %s", s);
 	  if (s[len-1] != '\n') debug_printf("\n");
 	  debug_printf("---\n");
 	  }
@@ -2344,9 +2345,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)
         {