From nobody Sat Oct 29 01:46:22 2022 X-Original-To: dev-commits-src-branches@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 4Mzj1p3tHrz4gXGP; Sat, 29 Oct 2022 01:46:22 +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 4Mzj1p2WPxz3fj3; Sat, 29 Oct 2022 01:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667007982; 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=MZe63QES/jZOGn/0JFtTSkc+CW27PTlj9hNCY87ZJhc=; b=ZVfwdwb8zs8njF+T4xktcilRy3CFOBma8ZlSztmFRjtEg/o39sQ2Rtq2ONveQfbTXFs97I dzQ36BT+JIG16xHdpt3F7Z0FdiHRHzUFeyQqms4UsD/ZH4Qx4DdDVJ2rWhEgvGjA6F7NHr zwvHJAAVb3YA+N3nN27ZGtEMcJX070x1IeMetWNZs82+s7F7E0Gjros6wO/Xh9AJcw+9wF crgg4mYS3BEH1DPwJjGJWHtP7HhkBh549pSlyTsICcI6YzkaYWrOKrVWMZZpdKDgdFFJAX FPyI720p+Jx7KZNYFDMni3v89UFbdyAJJRBFJNVeeEPDlhhg1sAqoQSGp1r9Jw== 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 4Mzj1p1bMsz10FR; Sat, 29 Oct 2022 01:46:22 +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 29T1kMem017329; Sat, 29 Oct 2022 01:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29T1kMi0017328; Sat, 29 Oct 2022 01:46:22 GMT (envelope-from git) Date: Sat, 29 Oct 2022 01:46:22 GMT Message-Id: <202210290146.29T1kMi0017328@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: 2123b467b4cc - stable/13 - sendmail: fix auth with cyrus-sasl-2.1.28 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 2123b467b4ccc79f9bddab3c7d5ba93b9c7414cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667007982; 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=MZe63QES/jZOGn/0JFtTSkc+CW27PTlj9hNCY87ZJhc=; b=tn7CKiD1Qs5GGX9NwavB8FvaVg54WX6Xm7pWG3nKj6cPEx553uDVJWSHOsojLu6VYaAaV+ LB9ZrWlZfFLkmLXQWlopZ1jfCm9FkkEJavxwD6iBKQNQZbvkbKGepb4mxOvL0SI7myOZVo sOeQvprmiXFVtpBsmA2wbQmz+p6SYVBibaW9VzfsAqjsIpY3dHfPPl0sgbRITNk6St5XQB T8LIw0K7cNItC4vecnVfgVXuu2g1DLyll31xvbiJgHQ1o+EZX38tYER7xfZrxJjGn2P/3R 4HYi0o9PfZKegTFE+we+DCbdz4x4psD5YAj8nKfLCWYflO0NrysvSdDz+jaMtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667007982; a=rsa-sha256; cv=none; b=HAkdN7V1+bI4CRGmztTbt9sAz8SU16ErUxTlWcYqJDIZ3QDX8JVCIK2IRMjsmFCpgnfIOJ MXkKjlqNBI7deW5FniWbfCTLDTEKGgnja9BA/rG7v3qV8LehhBQ+6BSmBI80bsqyx4HrGY LfiGAqbiEDNsdu8p6PIuidMe83Dl07z1Mv2fsCtBxDcV+lxWDIq+2Mf3djbs71tgixW2Np YvltVsFq0e4raMfqMD19DqMSAit0BnJ6e7j1AoYuXAR1ze3g3h97QEtqixKVCQ1i0EGKZC 5Dcftlfkgv723UX8nzdwweJVhoNmuAZG9Og3dyl9FrK9VOeWU8WvIO0zL30ilQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2123b467b4ccc79f9bddab3c7d5ba93b9c7414cd commit 2123b467b4ccc79f9bddab3c7d5ba93b9c7414cd Author: Ed Maste AuthorDate: 2022-10-25 15:53:07 +0000 Commit: Ed Maste CommitDate: 2022-10-29 01:45:43 +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) --- 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 *));