Gitweb:
http://git.exim.org/exim.git/commitdiff/ac7a78c5a176d65837fe4d0487d68b349739a126
Commit: ac7a78c5a176d65837fe4d0487d68b349739a126
Parent: 4a8ce2d88e1b24b456199ec5f2a799a6cb22ae91
Author: Todd Lyons <tlyons@???>
AuthorDate: Mon Apr 8 10:13:28 2013 -0700
Committer: Todd Lyons <tlyons@???>
CommitDate: Tue Apr 9 13:57:07 2013 -0700
Withhold TLD load error if not defined in conf
---
src/src/dmarc.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index d0a827b..f451fa6 100644
--- 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;
}
- 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);