From nobody Sat Oct 29 01:46:28 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mzj1w5HK3z4gX38; Sat, 29 Oct 2022 01:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mzj1w4pLhz3gKv; Sat, 29 Oct 2022 01:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667007988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fwoKdeX/9k6Y8a/r2ONJLMkXe5Jt23uF6YavGXYmiQ=; b=Wz2LCUfqKT/OhnkC3jnesi5jnq5mvWgHu53fWqwqW00qM3CDmnf3uInBlYxbmkTzG6VqXZ CvbY7fSU/V+T/pix2Qgl3ZNpIu+btHGa1sPZ2xi2Nw2EIqsCevZP49/VMdBDKwwj5ti013 dGQouGl5H4ubgKjbDIan+dmQ8Bld+kep4nFx814vQtLu/SWj5sQixbf+wg8+H45Oa3kuxH 7nCz2atHYvn5/UD/ajagM/xYO0yYfjjl+DKvOrbNpKZ1APK03Xsyr1QELZvdd/eyLcAX9L k0qO5pkpUh85p4si61q32Uh6FNONAWyjtRDzm2/ckAhX+TlVU0iMmfz6yNxGew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mzj1w3w4Vz10P4; Sat, 29 Oct 2022 01:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29T1kSAs017460; Sat, 29 Oct 2022 01:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29T1kSfZ017459; Sat, 29 Oct 2022 01:46:28 GMT (envelope-from git) Date: Sat, 29 Oct 2022 01:46:28 GMT Message-Id: <202210290146.29T1kSfZ017459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7dfe3b098123 - stable/12 - sendmail: fix auth with cyrus-sasl-2.1.28 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7dfe3b098123cd8652f173e3f40cb78e462f52ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667007988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fwoKdeX/9k6Y8a/r2ONJLMkXe5Jt23uF6YavGXYmiQ=; b=qg/qgO/NWhjDZOwoHV3ILWV76asObVKCy5o+/CAUXIJtvoEKL8reKtStrLWdBfxYIPB0hf 4WjMPv7MGdVNmPz12UkYuDIYTGEHOLEIs5e2Nc6bgG861TEHtMVh0iViLSW4lS11x+x133 XPmp/lqwe1J0/qMgBwSLKjYfnxEXd7foRS7glvLbSv3u6PIbF2NW9UA+weE1MojJNrfe2O twAZdvpgyRUnbvdBhy3WHpuYgfxAN8SyUkdBy6xyZtASxklXOV/fUrE2cBFoo32Sk0t3Q8 GOT6GTO1GymPli7407y5RQA3AfFD5jwFYKOBo48YXybNQIUG+Vo0Sbxpwwf98Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667007988; a=rsa-sha256; cv=none; b=j//CGEe9XHWRIRxxlea3N+hn+7G/4bJBILr65KVagBzOjICt2KtBkmPntW10RmuuM4ElXq COLkPcLAUaIX/BNgJsw9NQtu71QGhkfrznfndVuYJMyXvR1tIs4YN9K68+5X/BsEpRWtRy KNUPE2rjwFRnpUlJKA1PYVRVSGK0cLEn4/WkpSjtxnMwqt2sZXFqNpQ8udfFIqHaM5KWl0 vBTU+1MT8Bq+4MkRgb76c52IxHGGcWlNPxzfEOLNYPwPd1G+pT1oZsNsPWj+vyMZ4PtKLu Gpls+uafGZ2P00aH4oosRlYFeXc3KRL9MTAiP0i7wJvXKvVHzmmcWxuCkGlg5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7dfe3b098123cd8652f173e3f40cb78e462f52ed commit 7dfe3b098123cd8652f173e3f40cb78e462f52ed Author: Ed Maste AuthorDate: 2022-10-25 15:53:07 +0000 Commit: Ed Maste CommitDate: 2022-10-29 01:46:12 +0000 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) --- contrib/sendmail/src/sendmail.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 *));