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
DMARC: promote the support from Experimental to mainline
[exim.git]
/
src
/
src
/
moan.c
diff --git
a/src/src/moan.c
b/src/src/moan.c
index fea3683ba07631214eb7157e1b306040138f8cb4..f6cda37f2b709b9d8697d625ad20889bc6a3022f 100644
(file)
--- a/
src/src/moan.c
+++ b/
src/src/moan.c
@@
-73,7
+73,7
@@
int size_limit = bounce_return_size_limit;
FILE * fp;
int pid;
FILE * fp;
int pid;
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
uschar * s, * s2;
/* For DMARC if there is a specific sender set, expand the variable for the
uschar * s, * s2;
/* For DMARC if there is a specific sender set, expand the variable for the
@@
-111,7
+111,7
@@
fp = fdopen(fd, "wb");
if (errors_reply_to) fprintf(fp, "Reply-To: %s\n", errors_reply_to);
fprintf(fp, "Auto-Submitted: auto-replied\n");
if (errors_reply_to) fprintf(fp, "Reply-To: %s\n", errors_reply_to);
fprintf(fp, "Auto-Submitted: auto-replied\n");
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
if (s)
fprintf(fp, "From: %s\n", s);
else
if (s)
fprintf(fp, "From: %s\n", s);
else
@@
-228,7
+228,7
@@
switch(ident)
fprintf(fp, "\n");
break;
fprintf(fp, "\n");
break;
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
case ERRMESS_DMARC_FORENSIC:
bounce_return_message = TRUE;
bounce_return_body = FALSE;
case ERRMESS_DMARC_FORENSIC:
bounce_return_message = TRUE;
bounce_return_body = FALSE;
@@
-339,7
+339,7
@@
if (bounce_return_message)
fputs(CS buf, fp);
}
}
fputs(CS buf, fp);
}
}
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
/* Overkill, but use exact test in case future code gets inserted */
else if (bounce_return_body && message_file == NULL)
{
/* Overkill, but use exact test in case future code gets inserted */
else if (bounce_return_body && message_file == NULL)
{