From 1ca6fb563b0bf25b36a2961754d94cc54d3d9292 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 11 May 2024 02:38:21 +0200 Subject: [PATCH] lib/replace: make sure krb5_cc_default[_name]() is no longer used directly Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Tue May 14 11:22:28 UTC 2024 on atb-devel-224 --- lib/krb5_wrap/krb5_samba.c | 4 ++++ lib/replace/system/kerberos.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 51eea78f07e..e477aef37b3 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -4125,7 +4125,9 @@ krb5_error_code smb_krb5_init_context_common(krb5_context *_krb5_context) */ krb5_error_code smb_force_krb5_cc_default(krb5_context ctx, krb5_ccache *id) { +#undef krb5_cc_default return krb5_cc_default(ctx, id); +#define krb5_cc_default __ERROR__XX__NEVER_USE_krb5_cc_default__; } /* @@ -4134,7 +4136,9 @@ krb5_error_code smb_force_krb5_cc_default(krb5_context ctx, krb5_ccache *id) */ const char *smb_force_krb5_cc_default_name(krb5_context ctx) { +#undef krb5_cc_default_name return krb5_cc_default_name(ctx); +#define krb5_cc_default_name __ERROR__XX__NEVER_USE_krb5_cc_default_name__; } #else /* HAVE_KRB5 */ diff --git a/lib/replace/system/kerberos.h b/lib/replace/system/kerberos.h index ebd8657e612..f68eff50170 100644 --- a/lib/replace/system/kerberos.h +++ b/lib/replace/system/kerberos.h @@ -37,5 +37,8 @@ #include #endif +#define krb5_cc_default __ERROR__XX__NEVER_USE_krb5_cc_default__; +#define krb5_cc_default_name __ERROR__XX__NEVER_USE_krb5_cc_default_name__; + #endif #endif -- 2.47.3