71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From 624e3fe75116e15c48e9b9455ef0abd2f1256140 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
Date: Mon, 14 Jun 2021 21:56:16 +0200
|
|
Subject: [PATCH 04/16] KCM: use SSSDBG_MINOR_FAILURE for
|
|
ERR_KCM_OP_NOT_IMPLEMENTED
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
---
|
|
src/responder/kcm/kcmsrv_cmd.c | 13 +++++++++----
|
|
src/responder/kcm/kcmsrv_ops.c | 2 +-
|
|
2 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/responder/kcm/kcmsrv_cmd.c b/src/responder/kcm/kcmsrv_cmd.c
|
|
index 3ad17ef431bb3d42b39f56d04c97acfc25f06d2f..49518920bf8213d6c7a55f6c07aca11cbd86c406 100644
|
|
--- a/src/responder/kcm/kcmsrv_cmd.c
|
|
+++ b/src/responder/kcm/kcmsrv_cmd.c
|
|
@@ -195,7 +195,7 @@ static errno_t kcm_input_parse(struct kcm_reqbuf *reqbuf,
|
|
|
|
op_io->op = kcm_get_opt(be16toh(opcode_be));
|
|
if (op_io->op == NULL) {
|
|
- DEBUG(SSSDBG_CRIT_FAILURE,
|
|
+ DEBUG(SSSDBG_MINOR_FAILURE,
|
|
"Did not find a KCM operation handler for the requested opcode\n");
|
|
return ERR_KCM_OP_NOT_IMPLEMENTED;
|
|
}
|
|
@@ -312,7 +312,8 @@ static void kcm_reply_error(struct cli_ctx *cctx,
|
|
errno_t ret;
|
|
krb5_error_code kerr;
|
|
|
|
- DEBUG(SSSDBG_OP_FAILURE,
|
|
+ DEBUG(retcode == ERR_KCM_OP_NOT_IMPLEMENTED ?
|
|
+ SSSDBG_MINOR_FAILURE : SSSDBG_OP_FAILURE,
|
|
"KCM operation returns failure [%d]: %s\n",
|
|
retcode, sss_strerror(retcode));
|
|
kerr = sss2krb5_error(retcode);
|
|
@@ -405,8 +406,12 @@ static void kcm_cmd_request_done(struct tevent_req *req)
|
|
&req_ctx->op_io.reply);
|
|
talloc_free(req);
|
|
if (ret != EOK) {
|
|
- DEBUG(SSSDBG_OP_FAILURE,
|
|
- "KCM operation failed [%d]: %s\n", ret, sss_strerror(ret));
|
|
+ if (ret == ERR_KCM_OP_NOT_IMPLEMENTED) {
|
|
+ DEBUG(SSSDBG_MINOR_FAILURE, "%s\n", sss_strerror(ret));
|
|
+ } else {
|
|
+ DEBUG(SSSDBG_OP_FAILURE,
|
|
+ "KCM operation failed [%d]: %s\n", ret, sss_strerror(ret));
|
|
+ }
|
|
kcm_reply_error(req_ctx->cctx, ret, &req_ctx->repbuf);
|
|
return;
|
|
}
|
|
diff --git a/src/responder/kcm/kcmsrv_ops.c b/src/responder/kcm/kcmsrv_ops.c
|
|
index a8f49cedb0ce373e45a7f187ae87a82979c1a8c1..f7f80d85023d6ab3fdbf68078cd97594beb95e48 100644
|
|
--- a/src/responder/kcm/kcmsrv_ops.c
|
|
+++ b/src/responder/kcm/kcmsrv_ops.c
|
|
@@ -122,7 +122,7 @@ struct tevent_req *kcm_cmd_send(TALLOC_CTX *mem_ctx,
|
|
}
|
|
|
|
if (op->fn_send == NULL) {
|
|
- DEBUG(SSSDBG_CRIT_FAILURE,
|
|
+ DEBUG(SSSDBG_MINOR_FAILURE,
|
|
"KCM op %s has no handler\n", kcm_opt_name(op));
|
|
ret = ERR_KCM_OP_NOT_IMPLEMENTED;
|
|
goto immediate;
|
|
--
|
|
2.20.1
|
|
|