diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-10-25 15:53:07 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-10-31 17:16:20 +0000 |
| commit | 1ccfac2381c3a8a399be260377bb9181d4590a6c (patch) | |
| tree | 535bfb9a6ed3e3620608732e90c485b0995b796f | |
| parent | 50cb877af1fb6de40baa305dca93afdbd4de6568 (diff) | |
sendmail: fix auth with cyrus-sasl-2.1.28
Apply patch extracted from sendmail-8-17.1.9 snapshot by dinoex@.
PR: 262935
Reviewed by: gshapiro
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37119
(cherry picked from commit c898b54affbaa9fc22c1d1b1de4a175dd250f37e)
(cherry picked from commit 2123b467b4ccc79f9bddab3c7d5ba93b9c7414cd)
(cherry picked from commit 7dfe3b098123cd8652f173e3f40cb78e462f52ed)
Approved by: re (gjb)
| -rw-r--r-- | contrib/sendmail/src/sendmail.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h index e6cf45df0151..b51d4d0f076b 100644 --- a/contrib/sendmail/src/sendmail.h +++ b/contrib/sendmail/src/sendmail.h @@ -706,7 +706,7 @@ extern bool filesys_free __P((long)); # define SASL_IS_AUTH 2 /* authenticated */ /* SASL options */ -# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */ +# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */ # if SASL >= 20101 # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */ # else /* SASL >= 20101 */ @@ -721,6 +721,9 @@ ERROR: change SASL_SEC_MASK_ notify sendmail.org! # endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */ # endif /* SASL >= 20101 */ # define MAXOUTLEN 8192 /* length of output buffer, should be 2^n */ +# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0 +# ERROR "change SASL_AUTH_AUTH notify sendmail.org!" +# endif /* functions */ extern char *intersect __P((char *, char *, SM_RPOOL_T *)); |