diff options
author | Greg Hudson <ghudson@mit.edu> | 2021-02-12 15:11:25 -0500 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2021-02-17 15:29:02 -0500 |
commit | 3e36b25712d940a8e325abc407143634365b51d0 (patch) | |
tree | d0cb2617767d8c13f718dbdaff6d653420cb4224 | |
parent | 93a79dc5fa46d3a4d0ff841501fd9abca87e5098 (diff) | |
download | krb5-3e36b25712d940a8e325abc407143634365b51d0.zip krb5-3e36b25712d940a8e325abc407143634365b51d0.tar.gz krb5-3e36b25712d940a8e325abc407143634365b51d0.tar.bz2 |
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.
(cherry picked from commit 17ee97788611f8f8f4a6bd69968a9499f4db2215)
ticket: 8985
version_fixed: 1.19.1
-rw-r--r-- | src/lib/krb5/krb/init_ctx.c | 11 | ||||
-rw-r--r-- | src/lib/krb5/libkrb5.exports | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index be31eb3..aa35baa 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 72652f2..2d9d565 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -565,6 +565,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 |