From: Todd Lyons Date: Mon, 8 Apr 2013 17:13:28 +0000 (-0700) Subject: Withhold TLD load error if not defined in conf X-Git-Tag: exim-4_82_RC1~38 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ac7a78c5a176d65837fe4d0487d68b349739a126;p=exim.git Withhold TLD load error if not defined in conf --- diff --git a/src/src/dmarc.c b/src/src/dmarc.c index d0a827bb8..f451fa650 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);