[exim-cvs] Fix recent-openssl compile

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Fix recent-openssl compile
Gitweb: http://git.exim.org/exim.git/commitdiff/740f36d42bb3f61fdbaf53a68380a9a96096c229
Commit:     740f36d42bb3f61fdbaf53a68380a9a96096c229
Parent:     6c9ed72eaa948d340dba0ea0a878f9570852ab35
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Mar 25 17:11:56 2015 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Mar 25 17:11:56 2015 +0000


    Fix recent-openssl compile
---
 src/src/tls-openssl.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 96ac72c..65d6089 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -380,7 +380,7 @@ else
          /* client, wanting hostname check */
     {


-#if EXIM_HAVE_OPENSSL_CHECKHOST
+#ifdef EXIM_HAVE_OPENSSL_CHECKHOST
 # ifndef X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS
 #  define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0
 # endif
@@ -394,7 +394,8 @@ else
     while ((name = string_nextinlist(&list, &sep, NULL, 0)))
       if ((rc = X509_check_host(cert, name, 0,
           X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS
-          | X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS)))
+          | X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS,
+          NULL)))
     {
     if (rc < 0)
       {