From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 3 Feb 2019 11:35:30 +0000 (+0000)
Subject: tidying
X-Git-Tag: exim-4.93-RC0~284^2~11
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=72c385bddd9732b63b9c8fedb18e4469ddbead75

tidying
---

diff --git a/src/src/functions.h b/src/src/functions.h
index 8d2632c4b..c7acc2f52 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -112,6 +112,7 @@ extern int     auth_client_item(void *, auth_instance *, const uschar **,
 
 extern int     auth_get_data(uschar **, const uschar *, int);
 extern int     auth_get_no64_data(uschar **, uschar *);
+extern int     auth_prompt(const uschar *);
 extern int     auth_read_input(const uschar *);
 extern void    auth_show_supported(FILE *);
 extern uschar *auth_xtextencode(uschar *, int);
diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c
index 61cc70184..6a3351ecc 100644
--- a/src/src/lookups/nisplus.c
+++ b/src/src/lookups/nisplus.c
@@ -148,7 +148,8 @@ for (int i = 0; i < eo->en_cols.en_cols_len; i++)
   empty string for consistency. Remove trailing whitespace and zero
   bytes. */
 
-  if (value == NULL) value = US""; else
+  if (!value) value = US"";
+  else
     while (len > 0 && (value[len-1] == 0 || isspace(value[len-1])))
       len--;
 
@@ -156,7 +157,7 @@ for (int i = 0; i < eo->en_cols.en_cols_len; i++)
 
   if (!field_name)
     {
-    yield = string_cat (yield, tc->tc_name);
+    yield = string_cat (yield, US tc->tc_name);
     yield = string_catn(yield, US"=", 1);
 
     /* Quote the value if it contains spaces or is empty */
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 689af87b1..c8349e7c5 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -782,11 +782,13 @@ DEBUG(D_tls)
   }
 }
 
+#ifdef OPENSSL_HAVE_KEYLOG_CB
 static void
 keylog_callback(const SSL *ssl, const char *line)
 {
 DEBUG(D_tls) debug_printf("%.200s\n", line);
 }
+#endif