From nobody Sat Jul 8 03:15:27 2023 X-Original-To: dev-commits-src-main@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 4Qyb4H6j8Yz4lCbQ; Sat, 8 Jul 2023 03:15:27 +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 4Qyb4H6D7Kz4GNL; Sat, 8 Jul 2023 03:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688786127; 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=l4tOqctM7MhDBt1w37EL0B+IDpKIaBbn1y5rl/CR9OA=; b=KP0V1vB/Cf4JzLIeYlV5AhYVSD/i6UMGOkTJnXfdVJupt+QbJ5xKWbvIQMTsHOKDINmW7P ZVH05UlY19IGw83jBNg0vqPpFkGlCU1li44eV0BM9bBl8VGolTBybDDKczCy7Ze0gLZu4a ncGVn0Km5gak0jS5BnVmAYABpD15ArgV1LRSgpTpPPjecQej8IJB8q+XZG6RubMPr6e2wF GAJJmPpnlDScvxPkvhRnz6tQiBG++Rogft9TiTrByf+G1tBAdU9ywSlW90Bxgi2CBzo4hO qCXahQeDP887UNp38hVvn1ga1TIfAnwkRf/n4NupKQU9uXxz7sVHlZNCMha5Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688786127; 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=l4tOqctM7MhDBt1w37EL0B+IDpKIaBbn1y5rl/CR9OA=; b=dQ8bWmFeQxM9v15bBHrj1qxYc3yGoqEIBHwRacj7vKatdnhBB9H497T9IK2kyuipL5Tb0F iH71DCOX9Ux9K7f5jpQEs5yMu1k0Jmqhb8+ErkIRksGnDTSOtWShCPaICVH8kap/QJNHWX eEf3V8yyaHuwh4yap1KsgsmKhA2nyUhJ6xoBPc+7CvQ/c/jNK0YPfuCF2WAthUzNIWyJpw /7mX/27tbhxIV0wchohfRbxMaccnEAKesfnrRLXcPsBdD8VHscLYLn6LdQJJgKlw+jFJHg v9iRQKVjEOKad531AhYHlv3BUKZbGfcr9k8tmRmO27KQZltmIAZ+1lc/OIcxKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688786127; a=rsa-sha256; cv=none; b=nUa4n0t3ZnpYy4Z3uo+5sBnCJb9wB9WjQ/bqSaH+qAuebn78Q7Uak1woC6FFAvo4mp/j1/ IEPi194jDi6ZzrErN6sgh3v3iaN8jhZoFLnqgz1UXaiEn13eWwRotbEOd/yFcQ7s008ydJ InOVaCsNzsaEaQSxAVXa/Of2YyJrmg+2GxwQhBW5ZChGLM6b3SBgEZvvYFT16NoIo7yhnh fpF2t4y38qRGxijjCGD+K0IlHKi6Pddevw6ixTRFYu8ZEh8KcKJQGn+Vy3+TRSR9jNJwOw 9t4PTXlHdIXHwUWmTmNxgfFzJWYime3dHzolzKsi0bA/FIMlBAT7eqnrffYw7Q== 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 4Qyb4H5GPCz14cP; Sat, 8 Jul 2023 03:15:27 +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 3683FRN9042309; Sat, 8 Jul 2023 03:15:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3683FRHd042308; Sat, 8 Jul 2023 03:15:27 GMT (envelope-from git) Date: Sat, 8 Jul 2023 03:15:27 GMT Message-Id: <202307080315.3683FRHd042308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: bfa51318dee8 - main - pam_krb5: Add missing patch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bfa51318dee8afd9307f15e49a6a521938dccd06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bfa51318dee8afd9307f15e49a6a521938dccd06 commit bfa51318dee8afd9307f15e49a6a521938dccd06 Author: Cy Schubert AuthorDate: 2023-07-08 03:09:18 +0000 Commit: Cy Schubert CommitDate: 2023-07-08 03:09:18 +0000 pam_krb5: Add missing patch Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 MFC after: 1 day --- 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);