[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/72c385bddd9732b63b9c8fedb18e4469ddbead75

Commit:     72c385bddd9732b63b9c8fedb18e4469ddbead75
Parent:     a40f593b6106dcb1b01d9528838709c4cd20f030
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Feb 3 11:35:30 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Feb 4 13:18:53 2019 +0000

    tidying
---
 src/src/functions.h       | 1 +
 src/src/lookups/nisplus.c | 5 +++--
 src/src/tls-openssl.c     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/src/functions.h b/src/src/functions.h
index 8d2632c..c7acc2f 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 61cc701..6a3351e 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 689af87..c8349e7 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