Support PIPECONNECT with helo_data using the local IP, when interface is known.

[exim.git] / src / src / dmarc.c

diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index b1b89511a485628085c70c02f32042df949285a7..1bbaa7718daec0c900abde0d4ed88b3e0aff525f 100644 (file)
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -58,7 +58,7 @@ dmarc_version_report(gstring * g)
 {
 return string_fmt_append(g, "Library version: dmarc: Compile: %d.%d.%d.%d\n",
     (OPENDMARC_LIB_VERSION & 0xff000000) >> 24, (OPENDMARC_LIB_VERSION & 0x00ff0000) >> 16,
-    (OPENDMARC_LIB_VERSION & 0x0000ff00) >> 8, OPENDMARC_LIB_VERSION & 0x000000ff));
+    (OPENDMARC_LIB_VERSION & 0x0000ff00) >> 8, OPENDMARC_LIB_VERSION & 0x000000ff);
 }
 
 
@@ -231,7 +231,7 @@ if (rc == DNS_SUCCEED)
     if (rr->type == T_TXT && rr->size > 3)
       {
       store_free_dns_answer(dnsa);
-      return string_copyn_taint(US rr->data, rr->size, TRUE);
+      return string_copyn_taint(US rr->data, rr->size, GET_TAINTED);
       }
 store_free_dns_answer(dnsa);
 return NULL;
@@ -530,7 +530,7 @@ if (!dmarc_abort && !sender_host_authenticated)
   /* Can't use exim's string manipulation functions so allocate memory
   for libopendmarc using its max hostname length definition. */
 
-  dmarc_domain = store_get(DMARC_MAXHOSTNAMELEN, TRUE);
+  dmarc_domain = store_get(DMARC_MAXHOSTNAMELEN, GET_TAINTED);
   libdm_status = opendmarc_policy_fetch_utilized_domain(dmarc_pctx,
     dmarc_domain, DMARC_MAXHOSTNAMELEN-1);
   store_release_above(dmarc_domain + Ustrlen(dmarc_domain)+1);