From nobody Thu Jul 24 18:58:52 2025 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 4bp0f54vCwz633rl; Thu, 24 Jul 2025 18:58:53 +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 4bp0f4554pz3T36; Thu, 24 Jul 2025 18:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753383532; 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=uM367atAFxbjO7mab2Qd9Ln37RSYnE1ZxUTOHC6gEzQ=; b=HTcXU3XKR4gfLRl6N+AucbQCTuhdHnVIB8OoV3UToCGKjvGx54t80Ofra1qq+Q8jV+yN9G /+OjAwGW2iaUc2FYnR5GbeKugm4oUrDWVz3RTZjUcpKG3oFTn89ziT04xqs7S6oCS+Ef4+ RDfmHVZaKTsPSytztB8IE0WHDyj4ljiXoFOWih29RDM5rfXC57zRDnC/rdFHwfcVNY3C5i kpGdFCdjiG+KgIRuFzx32KcrLbiRWQQY49PO8Jz/9M1V3HQKR/i85cVSyTOXx39f8KAvIz ia+KhrEWtyRxDXmt0kPuYBnJfISmlnwZj6iJtjjNjBqVK9W0N3kF4xUviG4jJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753383532; 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=uM367atAFxbjO7mab2Qd9Ln37RSYnE1ZxUTOHC6gEzQ=; b=VfaAePmtbYRNzK0V+NDDC9ONQ2Dr9xReB/P6P0xvJcyxA45NEk75xHq2GvUk/4SRfYFnV0 1ejvAvWpHf6SPSKqRXd9spKKy6hQ5iAsgiKk2nMrvMntzSXpNqFjUuvy6r0LdLhq1+VY7+ wzscBB+XrjGm2Mm5QnKrMce6fkldMxqoGjmEQ7tnCYpgV02v20SfhXdsVtXJxGDS+WwQPA jnU7NPDCL0EapjNalRm8JrxFInXDoqU6VnyXV9DNjDN2Ymt4gnHEonxKVU0NDtzXSEtjep F4TLy4iI5ZjbW/8u3erqrtLDF3lLV8kWQR26BFJCfyP2qpA3lClcGRiXgIO2xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753383532; a=rsa-sha256; cv=none; b=B0h82ed8AuxiTDFjwWX9Lq+9tU5XzVNi3N9zfU68R2lPIJZwWm+Rh1Ch3YGiXdU/JVC5re WsjI99TRSyfPjXs5veyvHC3tQPI6J0p/eVcgQp6oQmnX9xyrAwb9Bnsj9RLXYFKVlsI66S fydAdYK5vfc++rIueDr0xNdurpZGosjXisYzXRYRcwSfBduhUBqtQT2jXdbP/BCE6VGwVo sCVw5vhx8x5toyrWkkvcThu2NwY+XMTCv184YStJd0AwYP/K58OHNRU4wQf6CRdDCeZ/8b ouf4qy1vTjgs/dARhUD1o8NM9H+q4eGSNymLZ6ujXmHSwt8njBk3Zncr4FABvA== 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 4bp0f432bKz19Cp; Thu, 24 Jul 2025 18:58:52 +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 56OIwqQP062246; Thu, 24 Jul 2025 18:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OIwqIj062243; Thu, 24 Jul 2025 18:58:52 GMT (envelope-from git) Date: Thu, 24 Jul 2025 18:58:52 GMT Message-Id: <202507241858.56OIwqIj062243@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: 110111a6cca1 - main - Revert "krb5: Use Heimdal DSO names" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 110111a6cca14dd46b6d68e6f34e141ff6b7e44e Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=110111a6cca14dd46b6d68e6f34e141ff6b7e44e commit 110111a6cca14dd46b6d68e6f34e141ff6b7e44e Author: Cy Schubert AuthorDate: 2025-07-24 18:40:42 +0000 Commit: Cy Schubert CommitDate: 2025-07-24 18:58:39 +0000 Revert "krb5: Use Heimdal DSO names" This is incorrect. This reverts commit 5f8493bbf479922ee027e2ee7dc733f29f66dd6d. --- krb5/lib/gssapi/version.map | 2 +- krb5/lib/krb5/version.map | 2 +- krb5/util/et/version.map | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map index c7fc5c5813aa..d52c0d3d1e36 100644 --- a/krb5/lib/gssapi/version.map +++ b/krb5/lib/gssapi/version.map @@ -85,7 +85,7 @@ HEIMDAL_GSS_2.0 { krb5_gss_register_acceptor_identity; }; -HEIMDAL_GSS_3.0 { +gssapi_krb5_2_MIT { global: GSS_C_ATTR_LOCAL_LOGIN_USER; GSS_C_INQ_SSPI_SESSION_KEY; diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map index 16fab76fc0c2..ce399a93e03e 100644 --- a/krb5/lib/krb5/version.map +++ b/krb5/lib/krb5/version.map @@ -215,7 +215,7 @@ HEIMDAL_KRB5_2.0 { krb5_write_message; }; -HEIMDAL_KRB5_3.0 { +krb5_3_MIT { global: _krb5_conf_boolean; decode_krb5_ad_kdcissued; diff --git a/krb5/util/et/version.map b/krb5/util/et/version.map index f659576e828e..3bd290009f22 100644 --- a/krb5/util/et/version.map +++ b/krb5/util/et/version.map @@ -8,7 +8,7 @@ HEIMDAL_COM_ERR_1.0 { set_com_err_hook; }; -HEIMDAL_COM_ERR_2.0 { +com_err_3_MIT { global: add_error_table; error_table_name_r;