aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Neil Shapiro <gshapiro@FreeBSD.org>2011-06-14 03:59:08 +0000
committerGregory Neil Shapiro <gshapiro@FreeBSD.org>2011-06-14 03:59:08 +0000
commita7054d5acb0e4a78e1ed182b976ac736d1333401 (patch)
treeed3127591355892a8b99a38de4a9e452ab09902f
parenta5629fe2522993df9f8beeb0255f9a46a06e8d98 (diff)
downloadsrc-a7054d5acb0e4a78e1ed182b976ac736d1333401.tar.gz
src-a7054d5acb0e4a78e1ed182b976ac736d1333401.zip
Notes
Notes: svn path=/vendor/sendmail/dist/; revision=223064 svn path=/vendor/sendmail/8.14.5/; revision=223065; tag=vendor/sendmail/8.14.5
-rw-r--r--src/sendmail.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sendmail.h b/src/sendmail.h
index b6219d654d9c..39ba16cf0cc6 100644
--- a/src/sendmail.h
+++ b/src/sendmail.h
@@ -721,9 +721,9 @@ MCI
#if STARTTLS
#define MCIF_TLS 0x00100000 /* STARTTLS supported */
#define MCIF_TLSACT 0x00200000 /* STARTTLS active */
-#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS)
#else /* STARTTLS */
-#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT)
+#define MCIF_TLS 0
+#define MCIF_TLSACT 0
#endif /* STARTTLS */
#define MCIF_DLVR_BY 0x00400000 /* DELIVERBY */
#if _FFR_IGNORE_EXT_ON_HELO
@@ -733,6 +733,8 @@ MCI
#define MCIF_AUTH2 0x02000000 /* got 2 AUTH lines */
#define MCIF_ONLY_EHLO 0x10000000 /* use only EHLO in smtpinit */
+#define MCIF_EXTENS (MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
+
/* states */
#define MCIS_CLOSED 0 /* no traffic on this connection */
#define MCIS_OPENING 1 /* sending initial protocol */