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
PIPE_CONNECT: promote from experimental
[exim.git]
/
src
/
src
/
dmarc.c
diff --git
a/src/src/dmarc.c
b/src/src/dmarc.c
index f29f7eba6af4bffb591ab839d45615ebc529ee8e..5bf33032a59f6b45d311077c6182b1466560047c 100644
(file)
--- a/
src/src/dmarc.c
+++ b/
src/src/dmarc.c
@@
-109,15
+109,15
@@
if (libdm_status != DMARC_PARSE_OKAY)
opendmarc_policy_status_to_str(libdm_status));
dmarc_abort = TRUE;
}
opendmarc_policy_status_to_str(libdm_status));
dmarc_abort = TRUE;
}
-if (!dmarc_tld_file)
+if (!dmarc_tld_file
|| !*dmarc_tld_file
)
{
DEBUG(D_receive) debug_printf("DMARC: no dmarc_tld_file\n");
dmarc_abort = TRUE;
}
else if (opendmarc_tld_read_file(CS dmarc_tld_file, NULL, NULL, NULL))
{
{
DEBUG(D_receive) debug_printf("DMARC: no dmarc_tld_file\n");
dmarc_abort = TRUE;
}
else if (opendmarc_tld_read_file(CS dmarc_tld_file, NULL, NULL, NULL))
{
- log_write(0, LOG_MAIN|LOG_PANIC, "DMARC failure to load tld list
%s: %d
",
- dmarc_tld_file,
errno
);
+ log_write(0, LOG_MAIN|LOG_PANIC, "DMARC failure to load tld list
'%s': %s
",
+ dmarc_tld_file,
strerror(errno)
);
dmarc_abort = TRUE;
}
if (!sender_host_address)
dmarc_abort = TRUE;
}
if (!sender_host_address)
@@
-157,7
+157,6
@@
return OK;
static void
dmarc_send_forensic_report(u_char **ruf)
{
static void
dmarc_send_forensic_report(u_char **ruf)
{
-int c;
uschar *recipient, *save_sender;
BOOL send_status = FALSE;
error_block *eblock = NULL;
uschar *recipient, *save_sender;
BOOL send_status = FALSE;
error_block *eblock = NULL;
@@
-183,7
+182,7
@@
if ( dmarc_policy == DMARC_POLICY_REJECT && action == DMARC_RESULT_REJECT
da == DMARC_POLICY_DKIM_ALIGNMENT_PASS ? US"yes" : US"no");
eblock = add_to_eblock(eblock, US"DMARC Results", dmarc_status_text);
da == DMARC_POLICY_DKIM_ALIGNMENT_PASS ? US"yes" : US"no");
eblock = add_to_eblock(eblock, US"DMARC Results", dmarc_status_text);
- for (c = 0; ruf[c]; c++)
+ for (
int
c = 0; ruf[c]; c++)
{
recipient = string_copylc(ruf[c]);
if (Ustrncmp(recipient, "mailto:",7))
{
recipient = string_copylc(ruf[c]);
if (Ustrncmp(recipient, "mailto:",7))