Date: Thu, 24 Jul 2025 18:59:38 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Cy Schubert <cy@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 5f8493bbf479 - main - krb5: Use Heimdal DSO names Message-ID: <4E045416-D94A-46D7-B43D-AC3078CF93AF@freebsd.org> In-Reply-To: <202507241747.56OHlIhB032321@gitrepo.freebsd.org> References: <202507241747.56OHlIhB032321@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 24 Jul 2025, at 18:47, Cy Schubert <cy@freebsd.org> wrote: >=20 > The branch main has been updated by cy: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5f8493bbf479922ee027e2ee7dc733f2= 9f66dd6d >=20 > commit 5f8493bbf479922ee027e2ee7dc733f29f66dd6d > Author: Cy Schubert <cy@FreeBSD.org> > AuthorDate: 2025-07-24 17:43:03 +0000 > Commit: Cy Schubert <cy@FreeBSD.org> > CommitDate: 2025-07-24 17:47:09 +0000 >=20 > krb5: Use Heimdal DSO names >=20 > Using MIT DSO names breaks the libc ABI, we are forced to use = Heimdal > DSO names. This is not optimal but necessary. >=20 > Fixes: e447c252d0ec > Requested by: kib I fear you=E2=80=99ve misinterpreted kib=E2=80=99s 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 =E2=80=9Cfor every kerberos library whose SONAME is currently the same between MIT KRB5 and Heimdal, please bump the SONAME, because they are not ABI-compatible=E2=80=9D. 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 = =E2=80=9Cdo A, no do B, no do C=E2=80=9D. 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(-) >=20 > 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; > }; >=20 > -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; > }; >=20 > -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; > }; >=20 > -com_err_3_MIT { > +HEIMDAL_COM_ERR_2.0 { > global: > add_error_table; > error_table_name_r;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E045416-D94A-46D7-B43D-AC3078CF93AF>