From nobody Sun Jul 09 02:38:07 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 4QzBBm1MKpz4lMh8; Sun, 9 Jul 2023 02:38:08 +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 4QzBBl6WGvz3NMM; Sun, 9 Jul 2023 02:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870287; 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=bKro98/speR+SRG0D8LmLdufZ2hHAjbO2IUrNDatL5c=; b=G/8yEFMvE+xbNLayuStBmlb3X+PpfSiJ9jHnPJu3ta4876izkFAijGsBk98tMus9ygf0G0 wLibNA76EeM1WwTGeIFFcUV8AeuEy8CmTqj3UToxej7vGJoV1Mg3W8voyDizaaomxx/iCv b/lD+315BynrsH3/Th0ukgInYDbbCFhIXJ81WJyQXQj1wvY0lSKui7QaabMVMErL1vBs2X /nVUu8TQbMsCV1P/yJ6a5H5FAMN3KVz582JGijEWnPlW4P8uhUaqSlmb2sMHutU5RihL8Y Fc/j1sQyl8ovK2Jbf2BDRDs+8YB9iaF2HPOfReiIinQxrygPCrn/rb7WRlOe4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870287; 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=bKro98/speR+SRG0D8LmLdufZ2hHAjbO2IUrNDatL5c=; b=QoMy3NUk7NEDFGbc3VzBHspcCs0QINDhgWpueIs48faVF1cKDX6z0xjBhj99qQfkL3VCbj r9JQ4QkUa5gbd5kGI3Ug2JCACvlciKxFoxns7ttfT5+slBIot29Sc473fkfSfhhR/4gAcc ihvyRZv7VaE/luEkssRPk3mWfW/O3pn0slLFpSlkp9/adM5LKVWajFQEVRZ0ZDznJ9vHpE 0Tt5P7kae9AJRvgRur8fAojVooOgDr1K8l8j8t3fCd2cZzotRyV3n8G2Z87Pr28JPFKqtx DYc32HNtMQIpt5iecDD52+fPQ3UTefvvjLurGJpYHbUuvtzvYGa+ljJjxXQULQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688870287; a=rsa-sha256; cv=none; b=m1J/12JlWjqFRSxRZI6J3vpqb+XSN6krI/n21AN07DYM98cCFYXQd9To70V/tStXtdOWP+ YeFcJn6hPj4fVPVf8/odHo+5NFoBgGC2o1Kid9As7W125OB3FyW6hkHk7R2AAkthry/97w JZH7QWPQEAjuBNRI2z3gR74/618NcY9Vit580umXZZsLLUQpR7VZlLeT36PT2m615cdP2R b6mbJ0Tz1+UneiEJcO1axuanfCJGWbyZHg7ANXcTbDB3fFWjSwmdxxeJaOPXKe6YaWOYK7 fBvfZYCMk9gfdzpabYgbMUlcyTD9oUKe4YACA8l28IZhLlD31PKm7cChho0cxA== 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 4QzBBl5cPdzlcs; Sun, 9 Jul 2023 02:38:07 +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 3692c7AX055011; Sun, 9 Jul 2023 02:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3692c7jB055010; Sun, 9 Jul 2023 02:38:07 GMT (envelope-from git) Date: Sun, 9 Jul 2023 02:38:07 GMT Message-Id: <202307090238.3692c7jB055010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: d295e418ae7e - stable/13 - 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d295e418ae7e60d87af6576ecdfad41a98d7442c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d295e418ae7e60d87af6576ecdfad41a98d7442c commit d295e418ae7e60d87af6576ecdfad41a98d7442c Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Cy Schubert CommitDate: 2023-07-08 05:44:29 +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) --- 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);