git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Withhold TLD load error if not defined in conf
[users/jgh/exim.git]
/
src
/
src
/
dmarc.c
diff --git
a/src/src/dmarc.c
b/src/src/dmarc.c
index d0a827bb8294ddb10aca3114eeeb94927a5dba98..f451fa6508434606f6c72101ad3b7d49767ff25e 100644
(file)
--- a/
src/src/dmarc.c
+++ b/
src/src/dmarc.c
@@
-98,7
+98,9
@@
int dmarc_init()
opendmarc_policy_status_to_str(libdm_status));
dmarc_abort = TRUE;
}
opendmarc_policy_status_to_str(libdm_status));
dmarc_abort = TRUE;
}
- if (opendmarc_tld_read_file(tld_file, NULL, NULL, NULL))
+ if (dmarc_tld_file == NULL)
+ dmarc_abort = TRUE;
+ else if (opendmarc_tld_read_file(tld_file, NULL, NULL, NULL))
{
log_write(0, LOG_MAIN|LOG_PANIC, "DMARC failure to load tld list %s: %d",
tld_file, errno);
{
log_write(0, LOG_MAIN|LOG_PANIC, "DMARC failure to load tld list %s: %d",
tld_file, errno);