tidying

diff --git a/src/src/functions.h b/src/src/functions.h
index 8d2632c4b34bfe7769436b685368248575952cde..c7acc2f5276d8ec189981931a81ab420d4af748d 100644 (file)
--- 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_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);
 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 61cc7018462b1a89e07ad5c2d9101f58f829c27d..6a3351eccab09168b88117ffeae17903a754cbf7 100644 (file)
--- 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. */
 
   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--;
 
     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)
     {
 
   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 */
     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 689af87b1690467c8cd7d58e55dc48b27c2a3a35..c8349e7c54459c27fb1513af6f4a0db66d0f5229 100644 (file)
--- 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);
 }
 static void
 keylog_callback(const SSL *ssl, const char *line)
 {
 DEBUG(D_tls) debug_printf("%.200s\n", line);
 }

+#endif