From nobody Mon Oct 31 17:18:18 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 4N1KcB3WSBz4gkXm; Mon, 31 Oct 2022 17:18:18 +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 4N1KcB2R8jz3hqj; Mon, 31 Oct 2022 17:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667236698; 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=gTTDEvs/CFntANxn5mWjl3XZIWwhkrbnu/n0wIDkJAc=; b=ETDKyypF0d9smV3arn50m8Uuisn0gZZY3gu1SnM2mAPboHhjAACc/KYR3EAjkvLuxt7Q+H WEvrazLr5EnIcBeOTqCs0ZCF9dFLP+ukvP0wol2qrX/55x7Omq0T0DsGnYCSd0gBp/bjxt 6KifzExoSQajn+AIKqgSfwoigK9939yZpFZTmGguifVoD7fMvJvAGzbNRKhK76/rGoSIod fUmFUAg/AaDw9Uq+sHBrY6K50fiNZPkPQ2t7b4/IKVSUOeRCSmxP2Z5Ge2LORuSFhTP4Ik 9ChUG2mrM0o70blo1D/TzaOfNG8YNh4Oxrm/F9NW0bd67ST+llFXdrwyPzhZpw== 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 4N1KcB0pfczkdJ; Mon, 31 Oct 2022 17:18:18 +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 29VHIInI003941; Mon, 31 Oct 2022 17:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VHIIeD003940; Mon, 31 Oct 2022 17:18:18 GMT (envelope-from git) Date: Mon, 31 Oct 2022 17:18:18 GMT Message-Id: <202210311718.29VHIIeD003940@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: 1ccfac2381c3 - releng/12.4 - 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 1ccfac2381c3a8a399be260377bb9181d4590a6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667236698; 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=gTTDEvs/CFntANxn5mWjl3XZIWwhkrbnu/n0wIDkJAc=; b=koMbzOuzHsctncpv7M/JFzcHg9jB+/7raARHYqdHsmkwA9c/hMiSHiE9emrSGTerXibOf4 rb4BmZMYHNGT7kTsPLgfGTyTMiVJJeyZp3368lvqBfdFFa+jrWKW03CGkA3bSrLHkkfCkp +y7vESk/1VLulkLCtLbXR3msGO5QGIBn7DsAmaAvfaI32rgsS6YrukYlxY83K/Hco0ZqHL VNZvQkBpDSt8gO6XXLyMAF1aeIQTcuVPZ/pi0KqD2qGniqwdvUFT4dE/Smw+Uli3Ff/exS GTkZ9YksYOV8QYkSx9POtdKJmZ2sCifnaeM2d2wTKkvVJ5lvMEpvrj2Rq8Ezdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667236698; a=rsa-sha256; cv=none; b=LXD4K4i3qVbdoKT3m8X71KczBvDgcoSOgyldLtltiY2ysxz7PKbeqrGYtRsI4pldLN8UP5 bPfN2WRZd1AZuyEgs0pg300Qdhvnta1jznXJG/qkYpG08wZE3kZgBsvxkBMUkbhhHVUYlB ceaqraKfHZTohE3sStbh2tSLn0Rke62Ko0G2TrqPuWvBAHIi+9yPJbAjC6tbWKThZtOQYj vl0GVnuhL+vfY3zCN7snJ3eMwGBuACtjSuOwcdS7JqnKfQiHLZIGcy7FKDHYmDP+mu0il8 sVncN0QrpCJe5/vhPW40PuFHNgJ82seSk7wJNg25oQ0aY/dtjD69SN0dNfrUAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1ccfac2381c3a8a399be260377bb9181d4590a6c commit 1ccfac2381c3a8a399be260377bb9181d4590a6c Author: Ed Maste AuthorDate: 2022-10-25 15:53:07 +0000 Commit: Ed Maste CommitDate: 2022-10-31 17:16:20 +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) (cherry picked from commit 7dfe3b098123cd8652f173e3f40cb78e462f52ed) Approved by: re (gjb) --- 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 *));