[exim-cvs] Unbreak non-DANE build

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Unbreak non-DANE build
Gitweb: https://git.exim.org/exim.git/commitdiff/9377b957cdd0f1057db6efb7bccbde13e7d2a27a
Commit:     9377b957cdd0f1057db6efb7bccbde13e7d2a27a
Parent:     afdb5e9cf07fa49e26e128d8d5d2e3cab7a5fe42
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Jun 26 12:01:15 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Jun 26 12:01:15 2018 +0100


    Unbreak non-DANE build


    Broken-by: afdb5e9cf0
---
 src/src/expand.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


diff --git a/src/src/expand.c b/src/src/expand.c
index 596fb24..a1a70c7 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4981,10 +4981,13 @@ while (*s != 0)
 #ifdef SUPPORT_TLS
     if (do_tls)
       {
-      tls_support tls_dummy = {0};
+      tls_support tls_dummy = {.sni=NULL};
       uschar * errstr;


-      if (!(tls_ctx = tls_client_start(fd, &host, NULL, NULL, NULL,
+      if (!(tls_ctx = tls_client_start(fd, &host, NULL, NULL,
+# ifdef SUPPORT_DANE
+                NULL,
+# endif
                   &tls_dummy, &errstr)))
         {
         expand_string_message = string_sprintf("TLS connect failed: %s", errstr);