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
Debug: expansions: refactor ascii-art/UTF8; mark up space & nl
[exim.git]
/
src
/
src
/
moan.c
diff --git
a/src/src/moan.c
b/src/src/moan.c
index a3c8e0aba4af20dc596e39f3ab71e02184b69d49..6fe82b29caf2aedce821ebad7654465f43057268 100644
(file)
--- a/
src/src/moan.c
+++ b/
src/src/moan.c
@@
-30,8
+30,9
@@
Returns: nothing
void
moan_write_from(FILE *f)
{
void
moan_write_from(FILE *f)
{
-uschar * s = expand_string(dsn_from);
-if (!s)
+uschar * s;
+GET_OPTION("dsn_from");
+if (!(s = expand_string(dsn_from)))
{
log_write(0, LOG_MAIN|LOG_PANIC,
"Failed to expand dsn_from (using default): %s", expand_string_message);
{
log_write(0, LOG_MAIN|LOG_PANIC,
"Failed to expand dsn_from (using default): %s", expand_string_message);
@@
-175,6
+176,7
@@
uschar * s, * s2;
/* For DMARC if there is a specific sender set, expand the variable for the
header From: and grab the address from that for the envelope FROM. */
/* For DMARC if there is a specific sender set, expand the variable for the
header From: and grab the address from that for the envelope FROM. */
+GET_OPTION("dmarc_forensic_sender");
if ( ident == ERRMESS_DMARC_FORENSIC
&& dmarc_forensic_sender
&& (s = expand_string(dmarc_forensic_sender))
if ( ident == ERRMESS_DMARC_FORENSIC
&& dmarc_forensic_sender
&& (s = expand_string(dmarc_forensic_sender))
@@
-513,9
+515,12
@@
if (check_sender && message_file && f.trusted_caller &&
{
uschar *new_sender = NULL;
if (regex_match_and_setup(regex_From, big_buffer, 0, -1))
{
uschar *new_sender = NULL;
if (regex_match_and_setup(regex_From, big_buffer, 0, -1))
+ {
+ GET_OPTION("uucp_from_sender");
new_sender = expand_string(uucp_from_sender);
new_sender = expand_string(uucp_from_sender);
+ }
if (new_sender) sender_address = new_sender;
if (new_sender) sender_address = new_sender;
-
else firstline = big_buffer;
+ else firstline = big_buffer;
}
/* If viable sender address, send a message */
}
/* If viable sender address, send a message */