From nobody Sun Jul 09 02:38:31 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 4QzBCC6hmlz4lN5B; Sun, 9 Jul 2023 02:38:31 +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 4QzBCC6J61z3NRX; Sun, 9 Jul 2023 02:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870311; 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=To5zgyZDjqh3Q8LM+HAZdH6H0M+vYbARORv3g1LAlLg=; b=HQPkiYFcbu8e6HzDrvlR8rEwwgHnkfmLpMJLSR5/FOCOkykMZ/uUhqZGVX8INKG4IQQd1g tjU90tAMpp54AIKZnBKCxqaS/UPvxYsBFE7WikH+kTVR4RmupBR0OYTcRZlz5hYFZWOkcz s6lec8a3f4kY81VOf61mJRbF94Gojz1xzkHar/BTS0/yi/ChBmDiwdSIm7aF/+NPyGOb6f p5bhJbbpeSUKO8kqENxv3rfBcbQ6sxLXwrD6OFds+ec7kNdEe2gRzHnW/GiAB9df7ObjzC ZjjfL88xZrU2rDR49qUFrY3Uuw5lFNi4OkRiEfWPXo0X3bGvx0RJ+wM5bl02hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688870311; 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=To5zgyZDjqh3Q8LM+HAZdH6H0M+vYbARORv3g1LAlLg=; b=vdvKN+e2m7epvUKdiAp5hLZn/Dmh19/r1ar0ou1MT7XqbwwH+sZrnRE8s1xhXgIPvgFZi7 ihNFsV3YDJ/llAfsHdeAJTWln+bSZNFWfu/UTPglbu/26SiV8exYvhgHLWe+k6n+WeS0CP fn1V3THxqQzq8j11hdkbQgvvUw+Mh+9Nvp5VZXl4j1pfULljVIvlpzKi2SjzSqQ5DXwVFM Po37c/9w277IVYator+s2n+t9Jvn6STZYenCKe8OJcRByxncPO1SmOV5aZ13wRAXnAaaeT 5bK0uC7kWCrltjN6jWIjmth+kqKZhA3jz/K/34FfLZvpXALgotpHBouZ9Xhf6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688870311; a=rsa-sha256; cv=none; b=Ln8XESBolV4I7eeiWZm3+OKwWpYtiJASO/ft00dhlkjFF2GVBSKkRfELM3DRULGjqqqQhc ogunDzFeUNBzmU3gXhznDCbEPGep86nhNLuvj1g6usJp8uq35utjqOiOZQ78ygrpShNr73 xykp/KEjVJwvifC5H/q+BSXEoBB9bvz45tDXiP0vXEO6gCCsmu7iL58NsFXFqJsBkGiMk3 V0E+BehuRAdrhqbAPRCBLkjQFeJs5FjJmmCCh6C5xxR7JzWoDlhzmIH457QEg8uaJG5Bwy KgMnFfXApFRXbJBmqmIWYzoJ5IKHyP739FAHwPs0CRpWr1FMTnT/c5zjFz6/Pg== 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 4QzBCC5LJ3zlP5; Sun, 9 Jul 2023 02:38:31 +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 3692cVSq055242; Sun, 9 Jul 2023 02:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3692cVBR055241; Sun, 9 Jul 2023 02:38:31 GMT (envelope-from git) Date: Sun, 9 Jul 2023 02:38:31 GMT Message-Id: <202307090238.3692cVBR055241@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: 6edaf8c7aead - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd commit 6edaf8c7aeada2ab6b84c8ce56fc179d5cf2eecd Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Cy Schubert CommitDate: 2023-07-08 05:44:51 +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);