TPDA tidying

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 78b669ad2cdbddd9ddb5acc852d79ef1c294fd6f..a598e2535693f2d23e50eea7893d9785aeb46e20 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -746,7 +746,7 @@ if (action)
   if (s && *s)
     {
     DEBUG(D_deliver)
-      debug_printf("TPDA(%s): event_action returned \"%s\"\n", s);
+      debug_printf("TPDA(%s): event_action returned \"%s\"\n", event, s);
     return DEFER;
     }
   }

diff --git a/src/src/functions.h b/src/src/functions.h
index d10a68a31de56882616aa1f4ada025ac894eae17..6328416dcec787e1ec85a2fbd7cfd29155c7be43 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -408,6 +408,11 @@ extern int     strncmpic(const uschar *, const uschar *, int);
 extern uschar *strstric(uschar *, uschar *, BOOL);
 
 extern uschar *tod_stamp(int);
+
+#ifdef EXPERIMENTAL_TPDA
+extern int     tpda_raise_event(uschar *, uschar *, uschar *);
+#endif
+
 extern void    tls_modify_variables(tls_support *);
 extern BOOL    transport_check_waiting(uschar *, uschar *, int, uschar *,
                  BOOL *);

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 5056e618876ef19186fe34bb567ebbd85f31be21..9278874ca061444a949d32b5824cd33af45f7172 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -1895,8 +1895,8 @@ does OCSP stapling we will get the callback (set in tls_init()) */
 if (request_ocsp)
   {
   const uschar * s;
-  if (  (s = ob->hosts_require_ocsp) && Ustrstr(s, US"tls_out_tlsa_usage")
-     || (s = ob->hosts_request_ocsp) && Ustrstr(s, US"tls_out_tlsa_usage")
+  if (  ((s = ob->hosts_require_ocsp) && Ustrstr(s, US"tls_out_tlsa_usage"))
+     || ((s = ob->hosts_request_ocsp) && Ustrstr(s, US"tls_out_tlsa_usage"))
      )
     {  /* Re-eval now $tls_out_tlsa_usage is populated.  If
        this means we avoid the OCSP request, we wasted the setup