You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.7 KiB
63 lines
2.7 KiB
From b4f3df953015bf6d2d4c973b458f778f31615c11 Mon Sep 17 00:00:00 2001 |
|
From: Greg Hudson <ghudson@mit.edu> |
|
Date: Tue, 11 May 2021 14:04:07 -0400 |
|
Subject: [PATCH] Fix KCM retrieval support for sssd |
|
|
|
Commit 795ebba8c039be172ab93cd41105c73ffdba0fdb added a retrieval |
|
handler using KCM_OP_RETRIEVE, falling back on the same error codes as |
|
the previous KCM_OP_GET_CRED_LIST support. But sssd (as of 2.4) |
|
returns KRB5_CC_NOSUPP instead of KRB5_CC_IO if it recognizes an |
|
opcode but does not implement it. Add a helper function to recognize |
|
all known unsupported-opcode error codes, and use it in kcm_retrieve() |
|
and kcm_start_seq_get(). |
|
|
|
ticket: 8997 |
|
(cherry picked from commit da103e36e13f3c846bcddbe38dd518a21e5260a0) |
|
(cherry picked from commit a5b2cff51808cd86fe8195e7ac074ecd25c3344d) |
|
--- |
|
src/lib/krb5/ccache/cc_kcm.c | 18 ++++++++++++++++-- |
|
1 file changed, 16 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/src/lib/krb5/ccache/cc_kcm.c b/src/lib/krb5/ccache/cc_kcm.c |
|
index 23fcf13ea..18505cd3d 100644 |
|
--- a/src/lib/krb5/ccache/cc_kcm.c |
|
+++ b/src/lib/krb5/ccache/cc_kcm.c |
|
@@ -144,6 +144,20 @@ map_tcflags(krb5_flags mitflags) |
|
return heimflags; |
|
} |
|
|
|
+/* |
|
+ * Return true if code could indicate an unsupported operation. Heimdal's KCM |
|
+ * returns KRB5_FCC_INTERNAL. sssd's KCM daemon (as of sssd 2.4) returns |
|
+ * KRB5_CC_NO_SUPP if it recognizes the operation but does not implement it, |
|
+ * and KRB5_CC_IO if it doesn't recognize the operation (which is unfortunate |
|
+ * since it could also indicate a communication failure). |
|
+ */ |
|
+static krb5_boolean |
|
+unsupported_op_error(krb5_error_code code) |
|
+{ |
|
+ return code == KRB5_FCC_INTERNAL || code == KRB5_CC_IO || |
|
+ code == KRB5_CC_NOSUPP; |
|
+} |
|
+ |
|
/* Begin a request for the given opcode. If cache is non-null, supply the |
|
* cache name as a request parameter. */ |
|
static void |
|
@@ -841,7 +855,7 @@ kcm_retrieve(krb5_context context, krb5_ccache cache, krb5_flags flags, |
|
ret = cache_call(context, cache, &req); |
|
|
|
/* Fall back to iteration if the server does not support retrieval. */ |
|
- if (ret == KRB5_FCC_INTERNAL || ret == KRB5_CC_IO) { |
|
+ if (unsupported_op_error(ret)) { |
|
ret = k5_cc_retrieve_cred_default(context, cache, flags, mcred, |
|
cred_out); |
|
goto cleanup; |
|
@@ -922,7 +936,7 @@ kcm_start_seq_get(krb5_context context, krb5_ccache cache, |
|
ret = kcmreq_get_cred_list(&req, &creds); |
|
if (ret) |
|
goto cleanup; |
|
- } else if (ret == KRB5_FCC_INTERNAL || ret == KRB5_CC_IO) { |
|
+ } else if (unsupported_op_error(ret)) { |
|
/* Fall back to GET_CRED_UUID_LIST. */ |
|
kcmreq_free(&req); |
|
kcmreq_init(&req, KCM_OP_GET_CRED_UUID_LIST, cache);
|
|
|