Handle absent tls_require_ciphers correctly.

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

diff --git a/src/src/tls.c b/src/src/tls.c
index 6175bbe465326c5659b6d68f8ee348ecb8eebbb2..f0eba37f82b5b456f62d4562729c2a11b912b7de 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/src/tls.c,v 1.6 2009/11/16 19:50:37 nm4 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
@@ -36,12 +34,13 @@ functions and the common functions below. */
 
 
 static uschar *ssl_xfer_buffer = NULL;
-static int ssl_xfer_buffer_size = 4096;
+static const int ssl_xfer_buffer_size = 4096;
 static int ssl_xfer_buffer_lwm = 0;
 static int ssl_xfer_buffer_hwm = 0;
 static int ssl_xfer_eof = 0;
 static int ssl_xfer_error = 0;
 
+uschar *tls_channelbinding_b64 = NULL;
 
 
 /*************************************************
@@ -60,11 +59,11 @@ Returns:    TRUE if OK; result may still be NULL after forced failure
 */
 
 static BOOL
-expand_check(uschar *s, uschar *name, uschar **result)
+expand_check(const uschar *s, const uschar *name, uschar **result)
 {
 if (s == NULL) *result = NULL; else
   {
-  *result = expand_string(s);
+  *result = expand_string(US s); /* need to clean up const some more */
   if (*result == NULL && !expand_string_forcedfail)
     {
     log_write(0, LOG_MAIN|LOG_PANIC, "expansion of %s failed: %s", name,