Withhold TLD load error if not defined in conf
authorTodd Lyons <tlyons@exim.org>
Mon, 8 Apr 2013 17:13:28 +0000 (10:13 -0700)
committerTodd Lyons <tlyons@exim.org>
Tue, 9 Apr 2013 20:57:07 +0000 (13:57 -0700)
src/src/dmarc.c

index d0a827bb8294ddb10aca3114eeeb94927a5dba98..f451fa6508434606f6c72101ad3b7d49767ff25e 100644 (file)
@@ -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);