From nobody Thu Jul 24 17:59:38 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 4bnzL025Npz631NK for ; Thu, 24 Jul 2025 17:59:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnzKz4DP1z4820 for ; Thu, 24 Jul 2025 17:59:51 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3a52874d593so827839f8f.0 for ; Thu, 24 Jul 2025 10:59:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753379990; x=1753984790; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cImwXEhUDTcx8nr6aZKnSiM36EUiUXK/04HWZe5uoNo=; b=NgXzbjABQoW7NdE8+uBKQVlJmGgXCFEcFyDhwzm76FZ4kTJryjy+g9e1psUk+0KnCD voewMU5RTlWhW0F/18VunPwGA8CRaJ4Tqhsq2cR/udMrgtU0mcb6bgkrjLBD7kb1/Bp0 42A2LCw/S1iwA/3JeEyABTL9Tv6IClZOlSBAYCskoKuuybR8wH4PjTL5AO+eupD4httT oH3t8+aKtA7A/B7ECgzalKzf0sGD0x6kEAtbFBarXxoEBGdsod6ryT18pyVESdbc2A0Z Of8ikGZNW5q1wyNLBcCsM2OZYKxOcTM0yd90y/Afih+7gaJKe8OhuOu2kFtTGXMpQqcU do7w== X-Forwarded-Encrypted: i=1; AJvYcCVytCfS1tOeOdbYKlhBkc1v50D4M+1ssUDU0w3P642rMlUyx0gkNlWFWVyw0znD4JZVEeYyq2Mvcwj9s5fNSVlLIPJMhA==@freebsd.org X-Gm-Message-State: AOJu0Yz6SaU5yNJLS7R9nftfgYfhmvz1z4LyO8KHC6tY69HBjTbkkAWX y4RexdcpCIF5aAD0h4nYDZsN+S/PQaxCR1vY4UryPmhNXapC14jMOtYqSrpK+UHNdwY= X-Gm-Gg: ASbGncur9UU1oZhvhuyQjmOs++APiDUvEpsW/TnAnppNkCtHJIa1Pt+DNtjYT1WhL+Y I0E/iP4Vuf4yKltBE2Wpl1auqxlJ412ikKsu07rB+YlvKbRD9QhFcAIS8IgP9jOIB0f9tC3mCjZ EIm0cq0F5dfFHISBpsaU6DOzLlZRxzj9Pmkwd1oQZkc0VeGKArARw6Aervod9/rvZ3S7xZzzhcV FIGqKJwgDMZ3upRS0wEfHrSZvVgtneGOOedI8s1tcpS8cpaViFd583MDkBOhDVMVYAyZ9loXk+D g/dTurLi16cFcqZsoDqol4H86YaeA1RejhVGske9NEj9QKgpaxwvgFA6QNXVX8U3SrBqFxrCsbA f/7/w4iUhyA7RxzDCrhvTV4YEXeCmB1NbXmevgQDbl/mYOeJ/BZVSufR0UnySyWGsqgN7 X-Google-Smtp-Source: AGHT+IGPK6tdNkvD77PVADUjtiXBxKTryRVDkHEOtExb97VJ4fZZa1fB6tbo7myKmRzbZyiRX2Eh9w== X-Received: by 2002:a05:6000:2dca:b0:3b5:f7a3:3960 with SMTP id ffacd0b85a97d-3b768ef9510mr6693190f8f.33.1753379989682; Thu, 24 Jul 2025 10:59:49 -0700 (PDT) Received: from smtpclient.apple (global-184-7.n-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45870553d72sm27502225e9.16.2025.07.24.10.59.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2025 10:59:49 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: Re: git: 5f8493bbf479 - main - krb5: Use Heimdal DSO names From: Jessica Clarke In-Reply-To: <202507241747.56OHlIhB032321@gitrepo.freebsd.org> Date: Thu, 24 Jul 2025 18:59:38 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4E045416-D94A-46D7-B43D-AC3078CF93AF@freebsd.org> References: <202507241747.56OHlIhB032321@gitrepo.freebsd.org> To: Cy Schubert X-Mailer: Apple Mail (2.3826.600.51.1.1) X-Rspamd-Queue-Id: 4bnzKz4DP1z4820 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 24 Jul 2025, at 18:47, Cy Schubert 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 > AuthorDate: 2025-07-24 17:43:03 +0000 > Commit: Cy Schubert > 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;