Retire EXPERIMENTAL_REQUIRETLS

[exim.git] / src / src / macros.h

diff --git a/src/src/macros.h b/src/src/macros.h
index 185ea6aff5c5b632e39e4275ac8045432cf21da4..a1dd99901ef7643f961bb6bce8405caf7c74f147 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -278,7 +278,9 @@ and some additional values are used only by non-driver functions.
 
 OK, FAIL, DEFER, ERROR, and FAIL_FORCED are also declared in local_scan.h for
 use in the local_scan() function and in ${dlfunc loaded functions. Do not
-change them unilaterally. */
+change them unilaterally.
+
+Use rc_names[] for debug strings. */
 
 #define  OK            0    /* Successful match */
 #define  DEFER         1    /* Defer - some problem */
@@ -470,6 +472,8 @@ enum {
   Li_incoming_interface,
   Li_incoming_port,
   Li_millisec,
+  Li_msg_id,
+  Li_msg_id_created,
   Li_outgoing_interface,
   Li_outgoing_port,
   Li_pid,
@@ -555,9 +559,7 @@ table exim_errstrings[] in log.c */
 #ifdef SUPPORT_I18N
 # define ERRNO_UTF8_FWD      (-49)   /* target not supporting SMTPUTF8 */
 #endif
-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
-# define ERRNO_REQUIRETLS    (-50)   /* REQUIRETLS session not started */
-#endif
+                               /* -50 free for re-use */
 
 /* These must be last, so all retry deferments can easily be identified */
 
@@ -1025,12 +1027,7 @@ enum { FILTER_UNSET, FILTER_FORWARD, FILTER_EXIM, FILTER_SIEVE };
 #define OPTION_PIPE            BIT(5)
 #define OPTION_SIZE            BIT(6)
 #define OPTION_CHUNKING                BIT(7)
-#define OPTION_REQUIRETLS      BIT(8)
-#define OPTION_EARLY_PIPE      BIT(9)
-
-/* Codes for tls_requiretls requests (usually by sender) */
-
-#define REQUIRETLS_MSG         BIT(0)  /* REQUIRETLS onward use */
+#define OPTION_EARLY_PIPE      BIT(8)
 
 /* Argument for *_getc */