From nobody Sat Aug 9 00:35:18 2025 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 4bzMPL5q5Xz64TXP; Sat, 09 Aug 2025 00:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzMPL4Jqjz3Fk4; Sat, 09 Aug 2025 00:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754699718; 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=+66BdDe09/0pPpDVWaFOD8VL40nmUME6zvwUX/o6d/k=; b=ZAE1Sr33gMcUuuVGgqfmmv/+ME7ORHs6zDRMF9wfXDutyodlGOCq1CdXYadLFe4EUTMGA+ H4JK2mnieVrYIpoFSCe3RBqxsR6TUEIAqXI1FjC1hcsevFYkrSp0w7FCNICZvOAas04Fyd vwa6g357LVmMaA61ZGSdugZopoiNFO2pfgF4G4oqr9ncVXK/M7c3aCzQLjZz8LvUaqfeDF b3EgzDLmr6ScGp/bhyx05OV2H9JuUnc1wO9uc7Y2WLcZeEZjUQJHnea6fP9brafEmZeiCD npeKR0idRyEFiBGVhXhrQ9Nbg5qfBUU1CHaXY00vQDqiL5BzuRDeO4m8f02gSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754699718; 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=+66BdDe09/0pPpDVWaFOD8VL40nmUME6zvwUX/o6d/k=; b=CuwLH0jyz98Gm9A78zLjlar177ZlF8+ey3AL1cH3PfNnPStt2b5ikIxZ0AeYrTVvpmt3Ux dHlm4Ty+WMtnX55suae9vMfMyWtCzKsfPKEQYJlVPIAPBLJ5jTA7KDzs7X2pe2vk4bXUQg wmr2CL7S5N5ETErRpIHAmYePyChr4hH26oFUdqHC+ShWUDTkG6GHrpuEyBtNsUuK9yfEwf FnDtHjtCo0o4EnkblQFRdA+/22L569qXl9FuqBg+MuexVVohmHPOXXJDeNLhMDPjhyJjM1 HDz4Jsgr30pWrap79QGwJ4t0lN2i0bREOrLN4EdJn2RIty4WmkVB+Mhxr8DmSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754699718; a=rsa-sha256; cv=none; b=kO7LGekzeW6jSUT+g6T4moyRieBSOSKIKaNFCSrEzHuiHAYxPZmaC0l4J6aag3rQlsU+D9 xM26u1Nao1H+N8KghslIWN271MZFZdIRi3g1yxXyL4OB/s0sP1yrivvx57y1czcXizy/Po 5n2MqFIa3Q+JApiidQuvwEJV505vJ0KDFfv03hyTyKBLqqkYjzv8MHvE2fUYbI9VxVnVm8 Jjay+Gd7XbIgboV4K1SezF/oRVydku+0KYpgZNf7EfuX4hBhAzdBF3UQ6PF7QfvN5PgRR9 e3zpw24OOpnoXSB5Y7epVzAqI88DqgE7cqRGmilPQMJoSHvGc255R2nP4bpq6Q== 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 4bzMPL3cKJzysV; Sat, 09 Aug 2025 00:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5790ZIch068073; Sat, 9 Aug 2025 00:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5790ZIb2068071; Sat, 9 Aug 2025 00:35:18 GMT (envelope-from git) Date: Sat, 9 Aug 2025 00:35:18 GMT Message-Id: <202508090035.5790ZIb2068071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 62fd20bde5a6 - main - rpcsec_gss: Rename KRBIMP_HESIOD1 to KRBIMP_HEIMDALV1 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62fd20bde5a6473143ae5091a562241eca156c30 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=62fd20bde5a6473143ae5091a562241eca156c30 commit 62fd20bde5a6473143ae5091a562241eca156c30 Author: Rick Macklem AuthorDate: 2025-08-09 00:32:04 +0000 Commit: Rick Macklem CommitDate: 2025-08-09 00:32:04 +0000 rpcsec_gss: Rename KRBIMP_HESIOD1 to KRBIMP_HEIMDALV1 This was a weird brain fart. Long ago I used a directory service called Hesiod, which was written by MIT. For some inexplicable reason, I used that name instead of Heimdal. This patch replaces the name with a Heimdal one. Suggested by: bjk Fixes: e3ac01e18eb3 ("kgssapi: Fix the kgssapi so that it can use MIT Kerberos") --- sys/rpc/rpcsec_gss/rpcsec_gss.c | 2 +- sys/rpc/rpcsec_gss/rpcsec_gss_int.h | 2 +- sys/rpc/rpcsec_gss/svc_rpcsec_gss.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss.c b/sys/rpc/rpcsec_gss/rpcsec_gss.c index 53770d139c61..89d1c56f7cc2 100644 --- a/sys/rpc/rpcsec_gss/rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/rpcsec_gss.c @@ -858,7 +858,7 @@ rpc_gss_init(AUTH *auth, rpc_gss_options_ret_t *options_ret) if (maj_stat == GSS_S_COMPLETE) my_krb_imp = KRBIMP_MIT; else - my_krb_imp = KRBIMP_HESIOD1; + my_krb_imp = KRBIMP_HEIMDALV1; } /* GSS context establishment loop. */ diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h index 02a7767220de..ba200ee3aeb7 100644 --- a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h +++ b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h @@ -75,7 +75,7 @@ struct rpc_gss_init_res { enum krb_imp { KRBIMP_UNKNOWN, - KRBIMP_HESIOD1, + KRBIMP_HEIMDALV1, KRBIMP_MIT }; diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c index e047c557c712..35c904560836 100644 --- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c +++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c @@ -937,7 +937,7 @@ svc_rpc_gss_accept_sec_context(struct svc_rpc_gss_client *client, if (maj_stat == GSS_S_COMPLETE) my_krb_imp = KRBIMP_MIT; else - my_krb_imp = KRBIMP_HESIOD1; + my_krb_imp = KRBIMP_HEIMDALV1; min_stat = 0; }