From nobody Tue Aug 1 20:04:15 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 4RFmKK3Fq8z4pnrM; Tue, 1 Aug 2023 20:04: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 4RFmKD35HSz3GN6; Tue, 1 Aug 2023 20:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920256; 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=BOE8ZjG23orBrPD156orgESZh3eY1YW6tZPDYlqdmdE=; b=KWvrzDtezNowOrd84EhazoG24xta0xkM68hcvyPk2jn8UqM2livF/zEUlkrgVMYbgwHS48 /4ZQeepOsFTcVIvPBfLpgKPkyjP6ZhjjmjurGflib0FFYblM2Q+lwq1YZCn2N66du3P37d pQ5y/g/JpggDzT/NC6rIAfx9/j9NeGwJdR5qAKTQnmC3Rz+bhDzls/i83JWVMN931FIr+P 3rbyPUNoU0HHzq1Ww8u4o+d/piFZCaEcR08tDzbcytGaaw2IqPqd4UGyaDGubto90fXLre rfe6mKHfeLmrMbKprC3nGkBHl8lduP7D9j6Mqhtt617BgXv79ZdnPCJO86l/mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920256; a=rsa-sha256; cv=none; b=h+qRDUZvXSGKuECkneh2mtAuBO6Upa5r8VepTu0cw6WGeABQLuojNF7vLJvGfHdQ60+tEj zbYCQPsCGPgIJFRfgwOqlSq5O41uDlsrSlrAPLLs6lg51na6klcNHhFbfhbRBlfihZBE0h 6c0VMc/S75zRd/QYwo4hM3jzXrBSwvFrnzbuGDgN7L/xjTFSQVzvHmzLQcGeT0SvD51s79 cezDRoPY+S0Gt1RdDaklKryQvfvUXI7FZPzRs5hX2tdsR4eKqo3x8zQ6N128lu1Evf75LC W3K+MvtmMsI1xvuhMtfTOQRMC1aMwkyFIubYaWzuxpAlBgTWMbJ/e0lN3oJEZA== 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=1690920256; 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=BOE8ZjG23orBrPD156orgESZh3eY1YW6tZPDYlqdmdE=; b=ig/oREnNofA4mbIPQEfcT3puS7fff9tL4TcLCbFawAmKfZjsYvqAAitMMvtYpRcXWXy6xT NLFSojPX4O6sAltwpvLa1YX0PLvPesGKD3pXIzV2WrfMP77ZHSIFNdt2IaFvLl6NA/H2GA tBb0006/EOKUoImGfI01MgTsaqgU2s/Q5vK3mcTaOiq1fGzzvlP/qxjysbb+t6b9NHtjxl yiSk/9CliXPTrjCt5r0mIfohWX70Z6/hz1Dy3nUyQ2QnPA8vThAvQoLOOHYNrGZTknyAU9 5dbeBg0yYZzqrFI45l3JdsmkurOR4TWqAYbSoIICMAxfR2hvFsimIswT8LXgiQ== 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 4RFmKD0Zk8zr1V; Tue, 1 Aug 2023 20:04:15 +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 371K4FIx012995; Tue, 1 Aug 2023 20:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4F4v012994; Tue, 1 Aug 2023 20:04:15 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:15 GMT Message-Id: <202308012004.371K4F4v012994@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: 9b45d8eddfac - releng/13.2 - 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.2 X-Git-Reftype: branch X-Git-Commit: 9b45d8eddfac906d9f78a84a9954f74c222a4ee2 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b45d8eddfac906d9f78a84a9954f74c222a4ee2 commit 9b45d8eddfac906d9f78a84a9954f74c222a4ee2 Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:50:30 +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);