diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-05-30 15:01:05 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-05-30 15:01:05 +0000 |
| commit | 4bf2326984df4af7975978597d6bdea7964b1a68 (patch) | |
| tree | 924064d5d5967eacc1975ee01027eebef6286455 /gnu | |
| parent | ef6688b93d7ff2d87b177fa2978df27a460f5cf0 (diff) | |
Apply sendmail 8.14.5 errata 2011-05-26 patch.
If a server offers two AUTH lines, the MTA would not read them after
STARTTLS has been used and hence SMTP AUTH for the client side would
fail.
ok millert@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.sbin/sendmail/sendmail/sendmail.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/usr.sbin/sendmail/sendmail/sendmail.h b/gnu/usr.sbin/sendmail/sendmail/sendmail.h index 72e82d7e817..121c7e2c738 100644 --- a/gnu/usr.sbin/sendmail/sendmail/sendmail.h +++ b/gnu/usr.sbin/sendmail/sendmail/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 */ |