From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 11 Aug 2015 21:54:53 +0000 (+0100)
Subject: GnuTLS: avoid whining about OCSP when not requested by config
X-Git-Tag: exim-4_87_RC1~124
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=4fb7df6d044a39151e72346ac0d67ac09686f704

GnuTLS: avoid whining about OCSP when not requested by config
---

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 8aabc5c6c..fe180946b 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -176,7 +176,9 @@ static const char * const exim_default_gnutls_priority = "NORMAL";
 
 static BOOL exim_gnutls_base_init_done = FALSE;
 
+#ifndef DISABLE_OCSP
 static BOOL gnutls_buggy_ocsp = FALSE;
+#endif
 
 
 /* ------------------------------------------------------------------------ */
@@ -1021,6 +1023,8 @@ return OK;
 *************************************************/
 
 
+#ifndef DISABLE_OCSP
+
 static BOOL
 tls_is_buggy_ocsp(void)
 {
@@ -1047,6 +1051,7 @@ if (maj == 3)
 return FALSE;
 }
 
+#endif
 
 
 /* Called from both server and client code. In the case of a server, errors
@@ -1112,8 +1117,10 @@ if (!exim_gnutls_base_init_done)
     }
 #endif
 
-  if ((gnutls_buggy_ocsp = tls_is_buggy_ocsp()))
+#ifndef DISABLE_OCSP
+  if (tls_ocsp_file && (gnutls_buggy_ocsp = tls_is_buggy_ocsp()))
     log_write(0, LOG_MAIN, "OCSP unusable with this GnuTLS library version");
+#endif
 
   exim_gnutls_base_init_done = TRUE;
   }