63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From abd8966a0b05236677e3b086ab935ba70f6aac0f Mon Sep 17 00:00:00 2001
|
|
From: Sumit Bose <sbose@redhat.com>
|
|
Date: Fri, 19 Aug 2022 13:53:35 +0200
|
|
Subject: [PATCH] BUILD: Accept krb5 1.20 for building the PAC plugin
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Additionally following MIT Kerberos the 'name' member of struct
|
|
krb5plugin_authdata_client_ftable_v0 is made 'const' and the related
|
|
code to set the name is simplified.
|
|
|
|
Resolves: https://github.com/SSSD/sssd/issues/6306
|
|
|
|
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
---
|
|
src/external/pac_responder.m4 | 3 ++-
|
|
src/sss_client/krb5_authdata_int.h | 2 +-
|
|
src/sss_client/sssd_pac.c | 2 +-
|
|
3 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4
|
|
index 26c6bd5bdd..3cbe3c9cfb 100644
|
|
--- a/src/external/pac_responder.m4
|
|
+++ b/src/external/pac_responder.m4
|
|
@@ -21,7 +21,8 @@ then
|
|
Kerberos\ 5\ release\ 1.16* | \
|
|
Kerberos\ 5\ release\ 1.17* | \
|
|
Kerberos\ 5\ release\ 1.18* | \
|
|
- Kerberos\ 5\ release\ 1.19*)
|
|
+ Kerberos\ 5\ release\ 1.19* | \
|
|
+ Kerberos\ 5\ release\ 1.20*)
|
|
krb5_version_ok=yes
|
|
AC_MSG_RESULT([yes])
|
|
;;
|
|
diff --git a/src/sss_client/krb5_authdata_int.h b/src/sss_client/krb5_authdata_int.h
|
|
index 5e0cf5e026..bafff71695 100644
|
|
--- a/src/sss_client/krb5_authdata_int.h
|
|
+++ b/src/sss_client/krb5_authdata_int.h
|
|
@@ -160,7 +160,7 @@ typedef krb5_error_code
|
|
void *dst_request_context);
|
|
|
|
typedef struct krb5plugin_authdata_client_ftable_v0 {
|
|
- char *name;
|
|
+ const char *name;
|
|
krb5_authdatatype *ad_type_list;
|
|
authdata_client_plugin_init_proc init;
|
|
authdata_client_plugin_fini_proc fini;
|
|
diff --git a/src/sss_client/sssd_pac.c b/src/sss_client/sssd_pac.c
|
|
index 8444834a7f..523b5c4e33 100644
|
|
--- a/src/sss_client/sssd_pac.c
|
|
+++ b/src/sss_client/sssd_pac.c
|
|
@@ -302,7 +302,7 @@ sssdpac_internalize(krb5_context kcontext,
|
|
static krb5_authdatatype sssdpac_ad_types[] = { KRB5_AUTHDATA_WIN2K_PAC, 0 };
|
|
|
|
krb5plugin_authdata_client_ftable_v0 authdata_client_0 = {
|
|
- ((void *)((uintptr_t)("sssd_sssdpac"))),
|
|
+ "sssd_sssdpac",
|
|
sssdpac_ad_types,
|
|
sssdpac_init,
|
|
sssdpac_fini,
|