From nobody Wed Oct 26 17:02:22 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 4MyFV65pDZz4ggJr; Wed, 26 Oct 2022 17:02: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 4MyFV65BJwz3ZnK; Wed, 26 Oct 2022 17:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666803742; 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=M5b+MNnzQhg7sqPUMMfIIvAvY+cQIMbgWKy7MypLwHs=; b=sBMNypnZfSmYV4BdYk4VwCTv48IWcpgqrs4XW2xHE+pDeDI1aDIOewHV9jlBp7YXv6Hfkk lPM1NU8SPNJYhuZZcEqSYNC+waqIOaPBcyg/0g87Wsqu81xYpcVbbxEDudGqm7w7BTB1U4 Cl1anXdxPLIppYl53N0H1aV7lKmattk9BZxZkbSnKtOrAuFwHzDvIzYlUEVlcYHd05IrPj 7ntevtnhjUQLa44BZdsQaR8Hz/ToN19ktFZTYhCqwPJM9mzl7m8n5FbXtJUibvJRou68h2 82N/5v0QiWS1YdVHwq6q8d6BDv4idK9dK9NftxdPlYBVoRxqdcsqOUoL9Cvytg== 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 4MyFV63NmtzPcZ; Wed, 26 Oct 2022 17:02: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 29QH2MfP011103; Wed, 26 Oct 2022 17:02:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QH2MFM011102; Wed, 26 Oct 2022 17:02:22 GMT (envelope-from git) Date: Wed, 26 Oct 2022 17:02:22 GMT Message-Id: <202210261702.29QH2MFM011102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c898b54affba - main - 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/main X-Git-Reftype: branch X-Git-Commit: c898b54affbaa9fc22c1d1b1de4a175dd250f37e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666803742; 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=M5b+MNnzQhg7sqPUMMfIIvAvY+cQIMbgWKy7MypLwHs=; b=PPgHC0DzE2L/AEFA6uIvMrASYkH3ieA9QT8725yuN6Mb2z18bFzpvHB25rSND1OSvXf76J +lEJEsjCymd5ny0PwGFXq0evgZS40Rme/AUAsJ3hXdv+WTuL+bonYducVTE6i8Sawvz6vt RW+/5ARGm5sCChVSZCa7hyMxYsOPK5TY+CWT8LPVyhbNpFgqi6r1z1jpJlVsEwVgYOKTC+ bFTupm92/19lE3ogSp6EM5GCVK5t1Z/6nQ7eWVLULFeb4nocmv+hhtYsH1CTbRnPjHKZrl rqSCcCyAnux4jwNxinWgwa21FYstpo1SWXJcvzKZRtTzHDazYgLRFslhc3W3nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666803742; a=rsa-sha256; cv=none; b=nXoH5U5hK4Oh/xRkO0Zb3LIawdbjMFjfyDKZkJzBjSg3iwtSwdIqASypMatg09dqSBtFVD sLpcpvXFGwu+zjv+s6TdFOEyjGGXh6XyUMd0EgkI0IcrA7w4jiQTaZjahiHLvdQABLps/b SnRLVZFHndZqrStY6Yk40Oh9NITPsl5nj4URjSctiePEKpvBO99wh6s2RywlnvZzVlFA1T 9HtAGYR+bO5xey0gpFHl3sZq9qsNtNTxcEjym3U+fwxSb+aQIp3VmP2iueRjtktlBpmT8c 4idJb9yrrO+fOcVONijvVL/3ZCeOptfa0v0ckT4zf4SHfOV8xejnBVGxD3KOoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c898b54affbaa9fc22c1d1b1de4a175dd250f37e commit c898b54affbaa9fc22c1d1b1de4a175dd250f37e Author: Ed Maste AuthorDate: 2022-10-25 15:53:07 +0000 Commit: Ed Maste CommitDate: 2022-10-26 16:58:56 +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 --- 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 *));