From f00db73d7bbf312e3e2a772b8b10895d5460b989 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 28 Nov 2018 21:24:08 +0100
Subject: [PATCH 21/23] KCM: Pass confdb context to the ccache db
initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves:
https://pagure.io/SSSD/sssd/issue/3386
The libsecrets back end needs to read the quota options from confdb,
therefore it needs to know the section and access the confdb handle.
These parameters are unused for other ccache back end types, but they
are harmless and IMO it makes more sense to keep the ccache back end
abstract.
Reviewed-by: Michal Židek <mzidek@redhat.com>
---
src/responder/kcm/kcm.c | 14 ++++++++++++--
src/responder/kcm/kcmsrv_ccache.c | 4 +++-
src/responder/kcm/kcmsrv_ccache.h | 2 ++
src/responder/kcm/kcmsrv_ccache_be.h | 4 +++-
src/responder/kcm/kcmsrv_ccache_mem.c | 4 +++-
src/responder/kcm/kcmsrv_ccache_secdb.c | 6 +++---
src/responder/kcm/kcmsrv_ccache_secrets.c | 4 +++-
7 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/responder/kcm/kcm.c b/src/responder/kcm/kcm.c
index 005dd168f..045c7801f 100644
--- a/src/responder/kcm/kcm.c
+++ b/src/responder/kcm/kcm.c
@@ -170,6 +170,8 @@ static int kcm_data_destructor(void *ptr)
static struct kcm_resp_ctx *kcm_data_setup(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path,
enum kcm_ccdb_be cc_be)
{
struct kcm_resp_ctx *kcm_data;
@@ -181,7 +183,11 @@ static struct kcm_resp_ctx *kcm_data_setup(TALLOC_CTX *mem_ctx,
return NULL;
}
- kcm_data->db = kcm_ccdb_init(kcm_data, ev, cc_be);
+ kcm_data->db = kcm_ccdb_init(kcm_data,
+ ev,
+ cdb,
+ confdb_service_path,
+ cc_be);
if (kcm_data->db == NULL) {
talloc_free(kcm_data);
return NULL;
@@ -235,7 +241,11 @@ static int kcm_process_init(TALLOC_CTX *mem_ctx,
goto fail;
}
- kctx->kcm_data = kcm_data_setup(kctx, ev, kctx->cc_be);
+ kctx->kcm_data = kcm_data_setup(kctx,
+ ev,
+ kctx->rctx->cdb,
+ kctx->rctx->confdb_service_path,
+ kctx->cc_be);
if (kctx->kcm_data == NULL) {
DEBUG(SSSDBG_FATAL_FAILURE,
"fatal error initializing responder data\n");
diff --git a/src/responder/kcm/kcmsrv_ccache.c b/src/responder/kcm/kcmsrv_ccache.c
index e7800662a..085cc4464 100644
--- a/src/responder/kcm/kcmsrv_ccache.c
+++ b/src/responder/kcm/kcmsrv_ccache.c
@@ -229,6 +229,8 @@ struct sss_iobuf *kcm_cred_get_creds(struct kcm_cred *crd)
struct kcm_ccdb *kcm_ccdb_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path,
enum kcm_ccdb_be cc_be)
{
errno_t ret;
@@ -270,7 +272,7 @@ struct kcm_ccdb *kcm_ccdb_init(TALLOC_CTX *mem_ctx,
return NULL;
}
- ret = ccdb->ops->init(ccdb);
+ ret = ccdb->ops->init(ccdb, cdb, confdb_service_path);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE, "Cannot initialize ccache database\n");
talloc_free(ccdb);
diff --git a/src/responder/kcm/kcmsrv_ccache.h b/src/responder/kcm/kcmsrv_ccache.h
index 0fd33325f..199b75b16 100644
--- a/src/responder/kcm/kcmsrv_ccache.h
+++ b/src/responder/kcm/kcmsrv_ccache.h
@@ -125,6 +125,8 @@ struct kcm_ccdb;
*/
struct kcm_ccdb *kcm_ccdb_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path,
enum kcm_ccdb_be cc_be);
/*
diff --git a/src/responder/kcm/kcmsrv_ccache_be.h b/src/responder/kcm/kcmsrv_ccache_be.h
index 7315f6435..166af3a76 100644
--- a/src/responder/kcm/kcmsrv_ccache_be.h
+++ b/src/responder/kcm/kcmsrv_ccache_be.h
@@ -30,7 +30,9 @@
#include "responder/kcm/kcmsrv_ccache.h"
typedef errno_t
-(*ccdb_init_fn)(struct kcm_ccdb *db);
+(*ccdb_init_fn)(struct kcm_ccdb *db,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path);
typedef struct tevent_req *
(*ccdb_nextid_send_fn)(TALLOC_CTX *mem_ctx,
diff --git a/src/responder/kcm/kcmsrv_ccache_mem.c b/src/responder/kcm/kcmsrv_ccache_mem.c
index 38bc2050d..35955b2f4 100644
--- a/src/responder/kcm/kcmsrv_ccache_mem.c
+++ b/src/responder/kcm/kcmsrv_ccache_mem.c
@@ -151,7 +151,9 @@ static int ccwrap_destructor(void *ptr)
return 0;
}
-static errno_t ccdb_mem_init(struct kcm_ccdb *db)
+static errno_t ccdb_mem_init(struct kcm_ccdb *db,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path)
{
struct ccdb_mem *memdb = NULL;
diff --git a/src/responder/kcm/kcmsrv_ccache_secdb.c b/src/responder/kcm/kcmsrv_ccache_secdb.c
index c68f53f97..d0d9a7e4c 100644
--- a/src/responder/kcm/kcmsrv_ccache_secdb.c
+++ b/src/responder/kcm/kcmsrv_ccache_secdb.c
@@ -520,7 +520,9 @@ done:
return ret;
}
-static errno_t ccdb_secdb_init(struct kcm_ccdb *db)
+static errno_t ccdb_secdb_init(struct kcm_ccdb *db,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path)
{
struct ccdb_secdb *secdb = NULL;
errno_t ret;
@@ -530,8 +532,6 @@ static errno_t ccdb_secdb_init(struct kcm_ccdb *db)
return ENOMEM;
}
- /* TODO: read configuration from the config file, adjust quotas */
-
ret = sss_sec_init(db, NULL, &secdb->sctx);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE,
diff --git a/src/responder/kcm/kcmsrv_ccache_secrets.c b/src/responder/kcm/kcmsrv_ccache_secrets.c
index 93be4fafa..6fa2a6dcc 100644
--- a/src/responder/kcm/kcmsrv_ccache_secrets.c
+++ b/src/responder/kcm/kcmsrv_ccache_secrets.c
@@ -659,7 +659,9 @@ static errno_t sec_get_ccache_recv(struct tevent_req *req,
/*
* The actual sssd-secrets back end
*/
-static errno_t ccdb_sec_init(struct kcm_ccdb *db)
+static errno_t ccdb_sec_init(struct kcm_ccdb *db,
+ struct confdb_ctx *cdb,
+ const char *confdb_service_path)
{
struct ccdb_sec *secdb = NULL;
--
2.20.1