From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 30 Oct 2014 18:52:45 +0000 (+0000)
Subject: Fix dnssec indication variable when used from smtp:commect event
X-Git-Tag: exim-4_85_RC1~17
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/805c9d531fcf74099459cc57e520a59b472e0de5

Fix dnssec indication variable when used from smtp:commect event
---

diff --git a/src/src/host.c b/src/src/host.c
index 2eef0ba70..7737704cd 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -3068,8 +3068,9 @@ DEBUG(D_host_lookup)
     yield);
   for (h = host; h != last->next; h = h->next)
     {
-    debug_printf("  %s %s MX=%d ", h->name,
-      (h->address == NULL)? US"<null>" : h->address, h->mx);
+    debug_printf("  %s %s MX=%d %s", h->name,
+      !h->address ? US"<null>" : h->address, h->mx,
+      h->dnssec == DS_YES ? US"DNSSEC " : US"");
     if (h->port != PORT_NONE) debug_printf("port=%d ", h->port);
     if (h->status >= hstatus_unusable) debug_printf("*");
     debug_printf("\n");
diff --git a/src/src/route.c b/src/src/route.c
index 6ba1d9f10..3834b836a 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -1969,7 +1969,7 @@ DEBUG(D_route)
     if (h->mx >= 0) debug_printf(" MX=%d", h->mx);
       else if (h->mx != MX_NONE) debug_printf(" rgroup=%d", h->mx);
     if (h->port != PORT_NONE) debug_printf(" port=%d", h->port);
-    /* if (h->dnssec != DS_UNK) debug_printf(" dnssec=%s", h->dnssec==DS_YES ? "yes" : "no"); */
+    if (h->dnssec != DS_UNK) debug_printf(" dnssec=%s", h->dnssec==DS_YES ? "yes" : "no");
     debug_printf("\n");
     }
   }
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index c57230697..12ae6e14d 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1415,7 +1415,10 @@ if (continue_hostname == NULL)
 
 #ifdef EXPERIMENTAL_EVENT
       {
-      uschar * s = event_raise(tblock->event_action, US"smtp:connect", buffer);
+      uschar * s;
+      lookup_dnssec_authenticated = host->dnssec==DS_YES ? US"yes"
+	: host->dnssec==DS_NO ? US"no" : NULL;
+      s = event_raise(tblock->event_action, US"smtp:connect", buffer);
       if (s)
 	{
 	set_errno(addrlist, 0,