From nobody Tue Aug 01 20:04:34 2023 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 4RFmKs39hpz4pnvp; Tue, 1 Aug 2023 20:04:37 +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 4RFmKc1yB7z3GWK; Tue, 1 Aug 2023 20:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; 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=TJ1GWon4RzfyMMoFMS4sENDUSnXjpsYiWm5a7BbSIH0=; b=VZIbJLnWMiLNnbhAInFUjE3GL29qQdGUxPaY9wWiiwcFfK+7eTdK1CC1hFZuLvxH+7tcGi 9VgXgadUl9eiI6hmuo/ldVN2uU5Te7Xtl0/m11QQadDu19X9XC8bYPmLEG7kjuMvj3VoSC TtRptGeLl14dunvzs1xooUscECNf9HG8a9eVnW74gIRg6Qbv7ZOmFjai0CHizikmRAkuTm XU05PSV/HwtY4Vdga//qI/pfjb5VdURmG9twgnnjRXkU6oknyyQesr+AFZIIyWfbM1IoO4 SVRbh8i5r7X9walL6RNL6bK3oCq1TSETkY+6mwG6hoP4JiHHtceax9/fStanhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920276; a=rsa-sha256; cv=none; b=X8enNzCOOm+Q7BOmTNA+2hFd6198H0vPWc8eIiMdcGNagN1i8UUarjDJyQ26eAkfeTbTt6 v24/uPGJ/so+nOFy7KBD8YHpg99fVS2F9qkUrT3fxxCciSQqsBE28LujRGeWKoL7Yrd5xn x5cgSrNvok1ZJtudC85Ljws5Jg+h80tMs6ynclN5AUldQik/Z9khoxqVwLRcqHo0ywHKM6 5bDywLyiadnYo+GBzmW6Hh1RPR4fdXGnBq2TFPm7Io8/BPgLQVi1lOYA+HDUXT5sO2rqaM fqaCFG+Pw7lrk8bH+LumUXI/EAGUq3v+DeTmhSHPokvxr/4Mk1rtbm9C5C2qCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; 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=TJ1GWon4RzfyMMoFMS4sENDUSnXjpsYiWm5a7BbSIH0=; b=F0POPw3Lcpkgf/gW/Rdfoda/Fz6wbFy7ZUM6Kxa20NK7v3yquwtxl5268WUsxBRHaZxGwb rrKbmwhyOV7LimB83ajWStplj+NNOK0ONLyK/+mj0GHu0h9zmfLJJYSLOl3qqnTlbDmpNQ 9d0Fgazlg2PNJkVkZb1L/k6+iBLCQftiLHopBnRqGqGe0SdafMI/MDDia9lvGaVK5DKXKJ je1peFwKj5raRvMfRtOjtaqHGXPGW6Hm804ZLQPRN1zYDz/t3bWJmnSvdFaZ3nsDXoBnNN av08rgaQm/hPZcR30GUDlcrCY3Sk0UorW7jgWEAEU2Yk2ouUrZMPk2UvdsNqVQ== 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 4RFmKb26NLzrMG; Tue, 1 Aug 2023 20:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371K4YIx013279; Tue, 1 Aug 2023 20:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4YaW013278; Tue, 1 Aug 2023 20:04:34 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:34 GMT Message-Id: <202308012004.371K4YaW013278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 140f65a20533 - releng/13.1 - pam_krb5: Add missing patch 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 140f65a205334682c4868708fcabfaaf237b5b3f Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=140f65a205334682c4868708fcabfaaf237b5b3f commit 140f65a205334682c4868708fcabfaaf237b5b3f Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:09 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit d295e418ae7e60d87af6576ecdfad41a98d7442c) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326 --- lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 3972479a581f..3c7976297ed2 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char *pam_service, int debug, continue; break; } - if (retval != 0) { /* failed to find key */ - /* Keytab or service key does not exist */ - if (debug) { - const char *msg = krb5_get_error_message(context, - retval); - syslog(LOG_DEBUG, - "pam_krb5: verify_krb_v5_tgt(): %s: %s", - "krb5_kt_read_service_key()", msg); - krb5_free_error_message(context, msg); - } - retval = 0; - } if (keyblock) krb5_free_keyblock(context, keyblock);