git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: move to mainline
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 4bb6d6da3a813833525c4807c718c4e0cb747720..14c0c7556bc5ece820b501f5b07e361f95e5a69a 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
7
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
#define DELIVER_BUFFER_SIZE 4096
/* See the file NOTICE for conditions of use and distribution. */
#define DELIVER_BUFFER_SIZE 4096
@@
-29,7
+29,7
@@
typedef struct {
uschar *hosts_try_auth;
uschar *hosts_require_auth;
uschar *hosts_try_chunking;
uschar *hosts_try_auth;
uschar *hosts_require_auth;
uschar *hosts_try_chunking;
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
uschar *hosts_try_dane;
uschar *hosts_require_dane;
#endif
uschar *hosts_try_dane;
uschar *hosts_require_dane;
#endif
@@
-46,7
+46,10
@@
typedef struct {
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
uschar *hosts_avoid_esmtp;
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
uschar *hosts_avoid_esmtp;
+#ifdef SUPPORT_TLS
uschar *hosts_nopass_tls;
uschar *hosts_nopass_tls;
+ uschar *hosts_noproxy_tls;
+#endif
int command_timeout;
int connect_timeout;
int data_timeout;
int command_timeout;
int connect_timeout;
int data_timeout;
@@
-112,7
+115,7
@@
typedef struct {
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
-#if defined(SUPPORT_TLS) && defined(
EXPERIMENTAL
_DANE)
+#if defined(SUPPORT_TLS) && defined(
SUPPORT
_DANE)
BOOL dane:1;
BOOL dane_required:1;
#endif
BOOL dane:1;
BOOL dane_required:1;
#endif
@@
-127,6
+130,7
@@
typedef struct {
int cmd_count;
uschar peer_offered;
int cmd_count;
uschar peer_offered;
+ uschar avoid_option;
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO
uschar * igquotstr;
uschar * helo_data;
#ifdef EXPERIMENTAL_DSN_INFO