On 24 Jul 2025, at 18:47, Cy Schubert <c...@freebsd.org> wrote:
>
> The branch main has been updated by cy:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=5f8493bbf479922ee027e2ee7dc733f29f66dd6d
>
> commit 5f8493bbf479922ee027e2ee7dc733f29f66dd6d
> Author: Cy Schubert <c...@freebsd.org>
> AuthorDate: 2025-07-24 17:43:03 +0000
> Commit: Cy Schubert <c...@freebsd.org>
> CommitDate: 2025-07-24 17:47:09 +0000
>
> krb5: Use Heimdal DSO names
>
> Using MIT DSO names breaks the libc ABI, we are forced to use Heimdal
> DSO names. This is not optimal but necessary.
>
> Fixes: e447c252d0ec
> Requested by: kib
I fear you’ve misinterpreted kib’s request; at least, this is the
opposite of how I read it. The request in question was:
> This breaks the ABI of _current_ libc on HEAD even more.
> Please do bump the dso versions for all libs from kerberos/gss
> with same current name as it was in Heimdal time.
I take that to mean “for every kerberos library whose SONAME is
currently the same between MIT KRB5 and Heimdal, please bump the
SONAME, because they are not ABI-compatible”.
What this commit does is instead silence presumed ABI incompatibility,
where previously it gave an error at run time.
As a more general point, this transition is becoming quite messy, with
lots of churn to handle post-commit feedback. I strongly encourage
pre-commit review for these changes so we can minimise instances of “do
A, no do B, no do C”.
Jessica
> ---
> 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 d52c0d3d1e36..c7fc5c5813aa 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;
> };
>
> -gssapi_krb5_2_MIT {
> +HEIMDAL_GSS_3.0 {
> 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 ce399a93e03e..16fab76fc0c2 100644
> --- a/krb5/lib/krb5/version.map
> +++ b/krb5/lib/krb5/version.map
> @@ -215,7 +215,7 @@ HEIMDAL_KRB5_2.0 {
> krb5_write_message;
> };
>
> -krb5_3_MIT {
> +HEIMDAL_KRB5_3.0 {
> global:
> _krb5_conf_boolean;
> decode_krb5_ad_kdcissued;
> diff --git a/krb5/util/et/version.map b/krb5/util/et/version.map
> index 3bd290009f22..f659576e828e 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;
> };
>
> -com_err_3_MIT {
> +HEIMDAL_COM_ERR_2.0 {
> global:
> add_error_table;
> error_table_name_r;
