[exim-cvs] TPDA tidying

Commit:     41afb5cb41e74e265963cb53fcdc6d85379d962a
Parent:     15b42734db72b251371c33c2247256a2d1ff5899
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Sep 10 15:13:53 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Sep 10 17:05:44 2014 +0100

    TPDA tidying
---
 src/src/deliver.c     |    2 +-
 src/src/functions.h   |    5 +++++
 src/src/tls-openssl.c |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 78b669a..a598e25 100644
--- 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 d10a68a..6328416 100644
--- 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 5056e61..9278874 100644
--- 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