diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:22:21 +0100 |
| commit | a1bccd48f3956b50a13a34f5aed4b72c658c61af (patch) | |
| tree | c2f216cea6f67db514741d89631ef11aa25abc09 /src/src/functions.h | |
| parent | d8129d876786c938f06dfbe91e51ebe36f09ae43 (diff) | |
| parent | a7538db17824b7fd70c12ef7561a67b85d6f247e (diff) | |
Merge branch 'master' into dane
Conflicts:
doc/doc-txt/ChangeLog
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
Diffstat (limited to 'src/src/functions.h')
| -rw-r--r-- | src/src/functions.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/src/functions.h b/src/src/functions.h index a6257a913..fee4429a5 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -44,7 +44,7 @@ extern uschar * tls_cert_fprt_sha1(void *); extern uschar * tls_cert_fprt_sha256(void *); extern int tls_client_start(int, host_item *, address_item *, - void *); + transport_instance *); extern void tls_close(BOOL, BOOL); extern int tls_export_cert(uschar *, size_t, void *); extern int tls_feof(void); @@ -337,7 +337,11 @@ extern int sieve_interpret(uschar *, int, uschar *, uschar *, uschar *, extern void sigalrm_handler(int); extern BOOL smtp_buffered(void); extern void smtp_closedown(uschar *); -extern int smtp_connect(host_item *, int, int, uschar *, int, BOOL, const uschar *); +extern int smtp_connect(host_item *, int, int, uschar *, int, BOOL, const uschar * +#ifdef EXPERIMENTAL_TPDA + , uschar * +#endif + ); extern int smtp_feof(void); extern int smtp_ferror(void); extern uschar *smtp_get_connection_info(void); |