Fix $regex<n> use-after-free. Bug 2915

[exim.git] / src / src / transports / smtp.h

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index aff3f545288a072199a15c12fd3f6cfa210a30ca..319e8494e302a941dc5fd13b78f2f67fef62177a 100644 (file)
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -2,8 +2,8 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #define DELIVER_BUFFER_SIZE 4096
@@ -48,6 +48,7 @@ typedef struct {
   uschar       *dscp;
   uschar       *serialize_hosts;
   uschar       *hosts_try_auth;
+  uschar       *hosts_require_alpn;
   uschar       *hosts_require_auth;
   uschar       *hosts_try_chunking;
 #ifdef SUPPORT_DANE
@@ -82,7 +83,7 @@ typedef struct {
   int          size_addition;
   int          hosts_max_try;
   int          hosts_max_try_hardlimit;
-  int                  message_linelength_limit;
+  int          message_linelength_limit;
   BOOL         address_retry_include_sender;
   BOOL         allow_localhost;
   BOOL         authenticated_sender_force;
@@ -101,11 +102,13 @@ typedef struct {
   uschar       *socks_proxy;
 #endif
 #ifndef DISABLE_TLS
+  uschar       *tls_alpn;
   uschar       *tls_certificate;
   uschar       *tls_crl;
   uschar       *tls_privatekey;
   uschar       *tls_require_ciphers;
 # ifndef DISABLE_TLS_RESUME
+  uschar       *host_name_extract;
   uschar       *tls_resumption_hosts;
 # endif
   const uschar *tls_sni;