From 17ee97788611f8f8f4a6bd69968a9499f4db2215 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 12 Feb 2021 15:11:25 -0500 Subject: [PATCH] Restore krb5_set_default_tgs_ktypes() Samba only uses the correct name (krb5_set_default_tgs_enctypes) if it cannot find the old one in the library, so removing the name causes a linker error for existing builds. ticket: 8985 (new) tags: pullup target_version: 1.19-next --- src/lib/krb5/krb/init_ctx.c | 11 +++++++++++ src/lib/krb5/libkrb5.exports | 1 + 2 files changed, 12 insertions(+) diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index be31eb31e0..aa35baa3c9 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -376,6 +376,17 @@ krb5_set_default_tgs_enctypes(krb5_context context, const krb5_enctype *etypes) return 0; } +/* Old name for above function. This is not a public API, but Samba (as of + * 2021-02-12) uses this name if it finds it in the library. */ +krb5_error_code +krb5_set_default_tgs_ktypes(krb5_context context, const krb5_enctype *etypes); + +krb5_error_code +krb5_set_default_tgs_ktypes(krb5_context context, const krb5_enctype *etypes) +{ + return krb5_set_default_tgs_enctypes(context, etypes); +} + /* * Add etype to, or remove etype from, the zero-terminated list *list_ptr, * reallocating if the list size changes. Filter out weak enctypes if diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index aab7f32fe5..0a05521d5a 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -568,6 +568,7 @@ krb5_set_config_files krb5_set_debugging_time krb5_set_default_realm krb5_set_default_tgs_enctypes +krb5_set_default_tgs_ktypes krb5_set_error_message krb5_set_password krb5_set_password_using_ccache -- 2.47.2