136 lines
5.3 KiB
Diff
136 lines
5.3 KiB
Diff
From 392f48c039d7a6d70bce6ae2d122042391653566 Mon Sep 17 00:00:00 2001
|
|
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
Date: Tue, 4 Apr 2017 14:45:30 +0200
|
|
Subject: [PATCH 89/93] SECRETS: Rename local_db_req.basedn to
|
|
local_db_req.req_dn
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This will make it possible to reuse the basedn name later for the "hive"
|
|
base DN in order to differentiate quotas for different hives.
|
|
|
|
There is no functional change in this patch.
|
|
|
|
Reviewed-by: Simo Sorce <simo@redhat.com>
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
---
|
|
src/responder/secrets/local.c | 30 +++++++++++++++---------------
|
|
1 file changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/src/responder/secrets/local.c b/src/responder/secrets/local.c
|
|
index 0b879939f25487b0275d5144f5e27b2873b3fbae..c833f1d27b42e4a453ac62d29d7649ff80200fba 100644
|
|
--- a/src/responder/secrets/local.c
|
|
+++ b/src/responder/secrets/local.c
|
|
@@ -206,7 +206,7 @@ static char *local_dn_to_path(TALLOC_CTX *mem_ctx,
|
|
|
|
struct local_db_req {
|
|
char *path;
|
|
- struct ldb_dn *basedn;
|
|
+ struct ldb_dn *req_dn;
|
|
};
|
|
|
|
#define LOCAL_SIMPLE_FILTER "(type=simple)"
|
|
@@ -231,9 +231,9 @@ static int local_db_get_simple(TALLOC_CTX *mem_ctx,
|
|
|
|
DEBUG(SSSDBG_TRACE_INTERNAL,
|
|
"Searching for [%s] at [%s] with scope=base\n",
|
|
- LOCAL_SIMPLE_FILTER, ldb_dn_get_linearized(lc_req->basedn));
|
|
+ LOCAL_SIMPLE_FILTER, ldb_dn_get_linearized(lc_req->req_dn));
|
|
|
|
- ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->basedn, LDB_SCOPE_BASE,
|
|
+ ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->req_dn, LDB_SCOPE_BASE,
|
|
attrs, "%s", LOCAL_SIMPLE_FILTER);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_TRACE_LIBS,
|
|
@@ -297,9 +297,9 @@ static int local_db_list_keys(TALLOC_CTX *mem_ctx,
|
|
|
|
DEBUG(SSSDBG_TRACE_INTERNAL,
|
|
"Searching for [%s] at [%s] with scope=subtree\n",
|
|
- LOCAL_SIMPLE_FILTER, ldb_dn_get_linearized(lc_req->basedn));
|
|
+ LOCAL_SIMPLE_FILTER, ldb_dn_get_linearized(lc_req->req_dn));
|
|
|
|
- ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->basedn, LDB_SCOPE_SUBTREE,
|
|
+ ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->req_dn, LDB_SCOPE_SUBTREE,
|
|
attrs, "%s", LOCAL_SIMPLE_FILTER);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_TRACE_LIBS,
|
|
@@ -321,7 +321,7 @@ static int local_db_list_keys(TALLOC_CTX *mem_ctx,
|
|
}
|
|
|
|
for (unsigned i = 0; i < res->count; i++) {
|
|
- keys[i] = local_dn_to_path(keys, lc_req->basedn, res->msgs[i]->dn);
|
|
+ keys[i] = local_dn_to_path(keys, lc_req->req_dn, res->msgs[i]->dn);
|
|
if (!keys[i]) {
|
|
ret = ENOMEM;
|
|
goto done;
|
|
@@ -483,7 +483,7 @@ static int local_db_put_simple(TALLOC_CTX *mem_ctx,
|
|
ret = ENOMEM;
|
|
goto done;
|
|
}
|
|
- msg->dn = lc_req->basedn;
|
|
+ msg->dn = lc_req->req_dn;
|
|
|
|
/* make sure containers exist */
|
|
ret = local_db_check_containers(msg, lctx, msg->dn);
|
|
@@ -587,9 +587,9 @@ static int local_db_delete(TALLOC_CTX *mem_ctx,
|
|
|
|
DEBUG(SSSDBG_TRACE_INTERNAL,
|
|
"Searching for [%s] at [%s] with scope=base\n",
|
|
- LOCAL_CONTAINER_FILTER, ldb_dn_get_linearized(lc_req->basedn));
|
|
+ LOCAL_CONTAINER_FILTER, ldb_dn_get_linearized(lc_req->req_dn));
|
|
|
|
- ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->basedn, LDB_SCOPE_BASE,
|
|
+ ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->req_dn, LDB_SCOPE_BASE,
|
|
attrs, LOCAL_CONTAINER_FILTER);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_TRACE_LIBS,
|
|
@@ -599,8 +599,8 @@ static int local_db_delete(TALLOC_CTX *mem_ctx,
|
|
|
|
if (res->count == 1) {
|
|
DEBUG(SSSDBG_TRACE_INTERNAL,
|
|
- "Searching for children of [%s]\n", ldb_dn_get_linearized(lc_req->basedn));
|
|
- ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->basedn, LDB_SCOPE_ONELEVEL,
|
|
+ "Searching for children of [%s]\n", ldb_dn_get_linearized(lc_req->req_dn));
|
|
+ ret = ldb_search(lctx->ldb, tmp_ctx, &res, lc_req->req_dn, LDB_SCOPE_ONELEVEL,
|
|
attrs, NULL);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_TRACE_LIBS,
|
|
@@ -612,13 +612,13 @@ static int local_db_delete(TALLOC_CTX *mem_ctx,
|
|
ret = EEXIST;
|
|
DEBUG(SSSDBG_OP_FAILURE,
|
|
"Failed to remove '%s': Container is not empty\n",
|
|
- ldb_dn_get_linearized(lc_req->basedn));
|
|
+ ldb_dn_get_linearized(lc_req->req_dn));
|
|
|
|
goto done;
|
|
}
|
|
}
|
|
|
|
- ret = ldb_delete(lctx->ldb, lc_req->basedn);
|
|
+ ret = ldb_delete(lctx->ldb, lc_req->req_dn);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_TRACE_LIBS,
|
|
"ldb_delete returned %d: %s\n", ret, ldb_strerror(ret));
|
|
@@ -645,7 +645,7 @@ static int local_db_create(TALLOC_CTX *mem_ctx,
|
|
ret = ENOMEM;
|
|
goto done;
|
|
}
|
|
- msg->dn = lc_req->basedn;
|
|
+ msg->dn = lc_req->req_dn;
|
|
|
|
/* make sure containers exist */
|
|
ret = local_db_check_containers(msg, lctx, msg->dn);
|
|
@@ -760,7 +760,7 @@ static int local_secrets_map_path(TALLOC_CTX *mem_ctx,
|
|
goto done;
|
|
}
|
|
|
|
- ret = local_db_dn(mem_ctx, ldb, basedn, lc_req->path, &lc_req->basedn);
|
|
+ ret = local_db_dn(mem_ctx, ldb, basedn, lc_req->path, &lc_req->req_dn);
|
|
if (ret != EOK) {
|
|
DEBUG(SSSDBG_CRIT_FAILURE,
|
|
"Failed to map request to local db DN\n");
|
|
--
|
|
2.14.1
|
|
|