git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
transport.c
diff --git
a/src/src/transport.c
b/src/src/transport.c
index 105238c9c13c65251bfa75fdf0464344604987db..d04ea516a5c4e3bc59366ed619393cf2160c0385 100644
(file)
--- a/
src/src/transport.c
+++ b/
src/src/transport.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* General functions concerned with transportation, and generic options for all
transports. */
/* 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
/* 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,
}
/* 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)
{
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)
{
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)
{
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)
{
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");
}
if (s[len-1] != '\n') debug_printf("\n");
debug_printf("---\n");
}
@@
-2344,9
+2345,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)
{