svn commit: r223064 - vendor/sendmail/dist/src

[Gregory Neil Shapiro]

Author: gshapiro
Date: Tue Jun 14 03:59:08 2011
New Revision: 223064
URL: http://svn.freebsd.org/changeset/base/223064

Log:
  Import errata patch as published at http://www.sendmail.com/sm/open_source/download/8.14.5/

Modified:
  vendor/sendmail/dist/src/sendmail.h

Modified: vendor/sendmail/dist/src/sendmail.h
==============================================================================
--- vendor/sendmail/dist/src/sendmail.h	Tue Jun 14 03:55:17 2011	(r223063)
+++ vendor/sendmail/dist/src/sendmail.h	Tue Jun 14 03:59:08 2011	(r223064)
@@ -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 */