diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-09-10 15:13:53 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-09-10 17:05:44 +0100 |
| commit | 41afb5cb41e74e265963cb53fcdc6d85379d962a (patch) | |
| tree | 1e988d9c73e000d7d5c090e9cb059ae23d90e746 | |
| parent | 15b42734db72b251371c33c2247256a2d1ff5899 (diff) | |
TPDA tidying
| -rw-r--r-- | src/src/deliver.c | 2 | ||||
| -rw-r--r-- | src/src/functions.h | 5 | ||||
| -rw-r--r-- | 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 78b669ad2..a598e2535 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 d10a68a31..6328416dc 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 5056e6188..9278874ca 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 |