diff --git a/0014-KCM-Fix-typo-in-ccdb_sec_delete_list_done.patch b/0014-KCM-Fix-typo-in-ccdb_sec_delete_list_done.patch new file mode 100644 index 0000000..5edf89d --- /dev/null +++ b/0014-KCM-Fix-typo-in-ccdb_sec_delete_list_done.patch @@ -0,0 +1,34 @@ +From 1c03afc703fb6e398915e2b2b200b7db19b4e6b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Mon, 26 Mar 2018 15:40:15 +0200 +Subject: [PATCH 14/15] KCM: Fix typo in ccdb_sec_delete_list_done() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When deleting the ccache we want to check if sec_key_list_len is equal 0 +and not if sec_key_list is 0. + +Signed-off-by: Fabiano Fidêncio + +Reviewed-by: Jakub Hrozek +--- + src/responder/kcm/kcmsrv_ccache_secrets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/responder/kcm/kcmsrv_ccache_secrets.c b/src/responder/kcm/kcmsrv_ccache_secrets.c +index 04dad9596..8a7a577d8 100644 +--- a/src/responder/kcm/kcmsrv_ccache_secrets.c ++++ b/src/responder/kcm/kcmsrv_ccache_secrets.c +@@ -2007,7 +2007,7 @@ static void ccdb_sec_delete_list_done(struct tevent_req *subreq) + return; + } + +- if (sec_key_list == 0) { ++ if (state->sec_key_list_len == 0) { + DEBUG(SSSDBG_MINOR_FAILURE, "No ccaches to delete\n"); + tevent_req_done(req); + return; +-- +2.14.3 + diff --git a/0015-KCM-Only-print-the-number-of-found-items-after-we-ha.patch b/0015-KCM-Only-print-the-number-of-found-items-after-we-ha.patch new file mode 100644 index 0000000..2a85141 --- /dev/null +++ b/0015-KCM-Only-print-the-number-of-found-items-after-we-ha.patch @@ -0,0 +1,45 @@ +From 94897e5c82967528dae2a79e42cd1eb3c3be68f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Tue, 27 Mar 2018 15:02:09 +0200 +Subject: [PATCH 15/15] KCM: Only print the number of found items after we have + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With the current code we've been always printing "Found 0 items" as +state->sec_key_list_len is only set by sec_list_parse(). + +In order to solve this, let's just print it *after* we have +state->sec_key_list_len set. + +Signed-off-by: Fabiano Fidêncio + +Reviewed-by: Jakub Hrozek +--- + src/responder/kcm/kcmsrv_ccache_secrets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/responder/kcm/kcmsrv_ccache_secrets.c b/src/responder/kcm/kcmsrv_ccache_secrets.c +index 8a7a577d8..f2b46460e 100644 +--- a/src/responder/kcm/kcmsrv_ccache_secrets.c ++++ b/src/responder/kcm/kcmsrv_ccache_secrets.c +@@ -207,7 +207,6 @@ static void sec_list_done(struct tevent_req *subreq) + return; + } + } else if (http_code == 200) { +- DEBUG(SSSDBG_TRACE_INTERNAL, "Found %zu items\n", state->sec_key_list_len); + ret = sec_list_parse(outbuf, state, + &state->sec_key_list, + &state->sec_key_list_len); +@@ -215,6 +214,7 @@ static void sec_list_done(struct tevent_req *subreq) + tevent_req_error(req, ret); + return; + } ++ DEBUG(SSSDBG_TRACE_INTERNAL, "Found %zu items\n", state->sec_key_list_len); + } else { + tevent_req_error(req, http2errno(http_code)); + return; +-- +2.14.3 + diff --git a/sssd.spec b/sssd.spec index f4a0b94..2e90152 100644 --- a/sssd.spec +++ b/sssd.spec @@ -54,6 +54,8 @@ Patch0010: 0010-KCM-Introduce-kcm_input_get_payload_len.patch Patch0011: 0011-KCM-Do-not-use-2048-as-fixed-size-for-the-payload.patch Patch0012: 0012-KCM-Adjust-REPLY_MAX-to-the-one-used-in-krb5.patch Patch0013: 0013-intg-convert-results-returned-as-bytes-to-strings.patch +Patch0014: 0014-KCM-Fix-typo-in-ccdb_sec_delete_list_done.patch +Patch0015: 0015-KCM-Only-print-the-number-of-found-items-after-we-ha.patch Patch0500: 0500-Revert-libwbclient-sssd-update-interface-to-version-.patch Patch0502: 0502-SYSTEMD-Use-capabilities.patch @@ -1257,6 +1259,7 @@ fi json_loads() - Resolves: upstream#3386 - KCM: Payload buffer is too small - Resolves: upstream#3666 - Fix usage of str.decode() in our tests +- A few KCM misc fixes * Fri Mar 9 2018 Fabiano Fidêncio - 1.16.1-1 - New upstream release 1.16.1