summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/db/sysdb_autofs.c62
-rw-r--r--src/db/sysdb_autofs.h20
-rw-r--r--src/db/sysdb_upgrade.c2
-rw-r--r--src/providers/ldap/sdap_async_autofs.c39
-rw-r--r--src/providers/ldap/sdap_autofs.c6
-rw-r--r--src/responder/autofs/autofssrv_cmd.c4
-rw-r--r--src/tests/sysdb-tests.c17
-rw-r--r--src/tools/sss_cache.c2
8 files changed, 60 insertions, 92 deletions
diff --git a/src/db/sysdb_autofs.c b/src/db/sysdb_autofs.c
index cb9685623..d297002f6 100644
--- a/src/db/sysdb_autofs.c
+++ b/src/db/sysdb_autofs.c
@@ -28,16 +28,15 @@
static struct ldb_dn *
sysdb_autofsmap_dn(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name)
{
- return sysdb_custom_dn(sysdb, mem_ctx, domain, map_name, AUTOFS_MAP_SUBDIR);
+ return sysdb_custom_dn(domain->sysdb, mem_ctx, domain,
+ map_name, AUTOFS_MAP_SUBDIR);
}
static struct ldb_dn *
sysdb_autofsentry_dn(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name,
const char *entry_name,
@@ -70,7 +69,7 @@ sysdb_autofsentry_dn(TALLOC_CTX *mem_ctx,
goto done;
}
- dn = ldb_dn_new_fmt(mem_ctx, sysdb->ldb, SYSDB_TMPL_AUTOFS_ENTRY,
+ dn = ldb_dn_new_fmt(mem_ctx, domain->sysdb->ldb, SYSDB_TMPL_AUTOFS_ENTRY,
rdn, map_name, AUTOFS_MAP_SUBDIR, domain->name);
done:
@@ -80,7 +79,6 @@ done:
char *
sysdb_autofsentry_strdn(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name,
const char *entry_name,
@@ -89,7 +87,7 @@ sysdb_autofsentry_strdn(TALLOC_CTX *mem_ctx,
struct ldb_dn *dn;
char *strdn;
- dn = sysdb_autofsentry_dn(mem_ctx, sysdb, domain,
+ dn = sysdb_autofsentry_dn(mem_ctx, domain,
map_name, entry_name, entry_value);
if (!dn) return NULL;
@@ -99,8 +97,7 @@ sysdb_autofsentry_strdn(TALLOC_CTX *mem_ctx,
}
errno_t
-sysdb_save_autofsmap(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_save_autofsmap(struct sss_domain_info *domain,
const char *name,
const char *autofsmapname,
struct sysdb_attrs *attrs,
@@ -163,7 +160,8 @@ sysdb_save_autofsmap(struct sysdb_ctx *sysdb_ctx,
goto done;
}
- ret = sysdb_store_custom(sysdb_ctx, domain, name, AUTOFS_MAP_SUBDIR, attrs);
+ ret = sysdb_store_custom(domain->sysdb, domain, name,
+ AUTOFS_MAP_SUBDIR, attrs);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("sysdb_store_custom failed [%d]: %s\n",
ret, strerror(ret)));
@@ -177,17 +175,15 @@ done:
}
errno_t
-sysdb_delete_autofsmap(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_delete_autofsmap(struct sss_domain_info *domain,
const char *name)
{
DEBUG(SSSDBG_TRACE_FUNC, ("Deleting autofs map %s\n", name));
- return sysdb_delete_custom(sysdb_ctx, domain, name, AUTOFS_MAP_SUBDIR);
+ return sysdb_delete_custom(domain->sysdb, domain, name, AUTOFS_MAP_SUBDIR);
}
errno_t
sysdb_get_map_byname(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name,
struct ldb_message **_map)
@@ -223,7 +219,7 @@ sysdb_get_map_byname(TALLOC_CTX *mem_ctx,
goto done;
}
- ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter,
+ ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
AUTOFS_MAP_SUBDIR, attrs,
&count, &msgs);
if (ret != EOK && ret != ENOENT) {
@@ -250,8 +246,7 @@ done:
}
errno_t
-sysdb_save_autofsentry(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_save_autofsentry(struct sss_domain_info *domain,
const char *map,
const char *key,
const char *value,
@@ -314,7 +309,7 @@ sysdb_save_autofsentry(struct sysdb_ctx *sysdb_ctx,
goto done;
}
- dn = sysdb_autofsentry_dn(tmp_ctx, sysdb_ctx, domain, map, key, value);
+ dn = sysdb_autofsentry_dn(tmp_ctx, domain, map, key, value);
if (!dn) {
ret = ENOMEM;
goto done;
@@ -330,7 +325,7 @@ sysdb_save_autofsentry(struct sysdb_ctx *sysdb_ctx,
msg->elements = attrs->a;
msg->num_elements = attrs->num;
- ret = ldb_add(sysdb_ctx->ldb, msg);
+ ret = ldb_add(domain->sysdb->ldb, msg);
ret = sysdb_error_to_errno(ret);
done:
talloc_free(tmp_ctx);
@@ -338,25 +333,24 @@ done:
}
errno_t
-sysdb_del_autofsentry(struct sysdb_ctx *sysdb_ctx,
+sysdb_del_autofsentry(struct sss_domain_info *domain,
const char *entry_dn)
{
struct ldb_dn *dn;
errno_t ret;
- dn = ldb_dn_new(NULL, sysdb_ctx_get_ldb(sysdb_ctx), entry_dn);
+ dn = ldb_dn_new(NULL, sysdb_ctx_get_ldb(domain->sysdb), entry_dn);
if (!dn) {
return ENOMEM;
}
- ret = sysdb_delete_entry(sysdb_ctx, dn, true);
+ ret = sysdb_delete_entry(domain->sysdb, dn, true);
talloc_free(dn);
return ret;
}
errno_t
sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *mapname,
size_t *_count,
@@ -379,7 +373,7 @@ sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx,
return ENOMEM;
}
- mapdn = sysdb_autofsmap_dn(tmp_ctx, sysdb, domain, mapname);
+ mapdn = sysdb_autofsmap_dn(tmp_ctx, domain, mapname);
if (!mapdn) {
ret = ENOMEM;
goto done;
@@ -392,7 +386,7 @@ sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx,
goto done;
}
- ret = sysdb_search_entry(tmp_ctx, sysdb, mapdn, LDB_SCOPE_ONELEVEL,
+ ret = sysdb_search_entry(tmp_ctx, domain->sysdb, mapdn, LDB_SCOPE_ONELEVEL,
filter, attrs, &count, &msgs);
if (ret != EOK && ret != ENOENT) {
DEBUG(SSSDBG_OP_FAILURE, ("sysdb search failed: %d\n", ret));
@@ -415,8 +409,7 @@ done:
}
errno_t
-sysdb_set_autofsmap_attr(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+sysdb_set_autofsmap_attr(struct sss_domain_info *domain,
const char *name,
struct sysdb_attrs *attrs,
int mod_op)
@@ -430,13 +423,13 @@ sysdb_set_autofsmap_attr(struct sysdb_ctx *sysdb,
return ENOMEM;
}
- dn = sysdb_autofsmap_dn(tmp_ctx, sysdb, domain, name);
+ dn = sysdb_autofsmap_dn(tmp_ctx, domain, name);
if (!dn) {
ret = ENOMEM;
goto done;
}
- ret = sysdb_set_entry_attr(sysdb, dn, attrs, mod_op);
+ ret = sysdb_set_entry_attr(domain->sysdb, dn, attrs, mod_op);
done:
talloc_free(tmp_ctx);
@@ -444,8 +437,7 @@ done:
}
errno_t
-sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain)
+sysdb_invalidate_autofs_maps(struct sss_domain_info *domain)
{
errno_t ret;
TALLOC_CTX *tmp_ctx;
@@ -472,7 +464,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
goto done;
}
- ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter,
+ ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
AUTOFS_MAP_SUBDIR, attrs,
&count, &msgs);
if (ret != EOK && ret != ENOENT) {
@@ -495,7 +487,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
goto done;
}
- ret = sysdb_transaction_start(sysdb);
+ ret = sysdb_transaction_start(domain->sysdb);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n"));
goto done;
@@ -509,7 +501,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
continue;
}
- ret = sysdb_set_autofsmap_attr(sysdb, domain, name,
+ ret = sysdb_set_autofsmap_attr(domain, name,
sys_attrs, SYSDB_MOD_REP);
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE, ("Could not expire map %s\n", name));
@@ -517,7 +509,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
}
}
- ret = sysdb_transaction_commit(sysdb);
+ ret = sysdb_transaction_commit(domain->sysdb);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not commit transaction\n"));
goto done;
@@ -527,7 +519,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
ret = EOK;
done:
if (in_transaction) {
- sret = sysdb_transaction_cancel(sysdb);
+ sret = sysdb_transaction_cancel(domain->sysdb);
if (sret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n"));
}
diff --git a/src/db/sysdb_autofs.h b/src/db/sysdb_autofs.h
index 1c334cf79..d1ef8412e 100644
--- a/src/db/sysdb_autofs.h
+++ b/src/db/sysdb_autofs.h
@@ -36,8 +36,7 @@
#define SYSDB_AUTOFS_ENTRY_VALUE "automountInformation"
errno_t
-sysdb_save_autofsmap(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_save_autofsmap(struct sss_domain_info *domain,
const char *name,
const char *autofsmapname,
struct sysdb_attrs *attrs,
@@ -46,49 +45,42 @@ sysdb_save_autofsmap(struct sysdb_ctx *sysdb_ctx,
errno_t
sysdb_get_map_byname(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name,
struct ldb_message **map);
errno_t
-sysdb_delete_autofsmap(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_delete_autofsmap(struct sss_domain_info *domain,
const char *name);
errno_t
-sysdb_save_autofsentry(struct sysdb_ctx *sysdb_ctx,
- struct sss_domain_info *domain,
+sysdb_save_autofsentry(struct sss_domain_info *domain,
const char *map,
const char *key,
const char *value,
struct sysdb_attrs *attrs);
errno_t
-sysdb_del_autofsentry(struct sysdb_ctx *sysdb_ctx,
+sysdb_del_autofsentry(struct sss_domain_info *domain,
const char *entry_dn);
errno_t
sysdb_autofs_entries_by_map(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *mapname,
size_t *_count,
struct ldb_message ***_entries);
errno_t
-sysdb_set_autofsmap_attr(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+sysdb_set_autofsmap_attr(struct sss_domain_info *domain,
const char *name,
struct sysdb_attrs *attrs,
int mod_op);
errno_t
-sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain);
+sysdb_invalidate_autofs_maps(struct sss_domain_info *domain);
char *
sysdb_autofsentry_strdn(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *map_name,
const char *entry_name,
diff --git a/src/db/sysdb_upgrade.c b/src/db/sysdb_upgrade.c
index 3c23babe3..377286d98 100644
--- a/src/db/sysdb_upgrade.c
+++ b/src/db/sysdb_upgrade.c
@@ -1228,7 +1228,7 @@ int sysdb_upgrade_11(struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
continue;
}
- ret = sysdb_save_autofsentry(sysdb, domain,
+ ret = sysdb_save_autofsentry(domain,
(const char *) val->data,
key, value, NULL);
if (ret != EOK) {
diff --git a/src/providers/ldap/sdap_async_autofs.c b/src/providers/ldap/sdap_async_autofs.c
index 4d5e953d7..d9ea2980d 100644
--- a/src/providers/ldap/sdap_async_autofs.c
+++ b/src/providers/ldap/sdap_async_autofs.c
@@ -83,8 +83,7 @@ get_autofs_entry_value(struct sysdb_attrs *entry, struct sdap_options *opts)
}
static errno_t
-add_autofs_entry(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+add_autofs_entry(struct sss_domain_info *domain,
const char *map,
struct sdap_options *opts,
struct sysdb_attrs *entry)
@@ -104,12 +103,11 @@ add_autofs_entry(struct sysdb_ctx *sysdb,
return EINVAL;
}
- return sysdb_save_autofsentry(sysdb, domain, map, key, value, NULL);
+ return sysdb_save_autofsentry(domain, map, key, value, NULL);
}
static errno_t
-save_autofs_entries(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+save_autofs_entries(struct sss_domain_info *domain,
struct sdap_options *opts,
const char *map,
char **add_dn_list,
@@ -146,7 +144,7 @@ save_autofs_entries(struct sysdb_ctx *sysdb,
DEBUG(SSSDBG_TRACE_FUNC,
("Saving autofs entry [%s]\n", add_dn_list[i]));
- ret = add_autofs_entry(sysdb, domain, map, opts, entry);
+ ret = add_autofs_entry(domain, map, opts, entry);
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
("Cannot save entry [%s] to cache\n", add_dn_list[i]));
@@ -161,7 +159,7 @@ save_autofs_entries(struct sysdb_ctx *sysdb,
}
static errno_t
-del_autofs_entries(struct sysdb_ctx *sysdb,
+del_autofs_entries(struct sss_domain_info *dom,
struct sdap_options *opts,
const char *map,
char **del_dn_list)
@@ -173,7 +171,7 @@ del_autofs_entries(struct sysdb_ctx *sysdb,
DEBUG(SSSDBG_TRACE_FUNC,
("Removing autofs entry [%s]\n", del_dn_list[i]));
- ret = sysdb_del_autofsentry(sysdb, del_dn_list[i]);
+ ret = sysdb_del_autofsentry(dom, del_dn_list[i]);
if (ret) {
DEBUG(SSSDBG_MINOR_FAILURE,
("Cannot delete entry %s\n", del_dn_list[i]));
@@ -186,8 +184,7 @@ del_autofs_entries(struct sysdb_ctx *sysdb,
}
static errno_t
-save_autofs_map(struct sysdb_ctx *sysdb,
- struct sss_domain_info *dom,
+save_autofs_map(struct sss_domain_info *dom,
struct sdap_options *opts,
struct sysdb_attrs *map)
{
@@ -200,7 +197,7 @@ save_autofs_map(struct sysdb_ctx *sysdb,
now = time(NULL);
- ret = sysdb_save_autofsmap(sysdb, dom, mapname, mapname,
+ ret = sysdb_save_autofsmap(dom, mapname, mapname,
NULL, dom->autofsmap_timeout, now);
if (ret != EOK) {
return ret;
@@ -215,7 +212,6 @@ struct automntmaps_process_members_state {
struct sdap_handle *sh;
struct sss_domain_info *dom;
int timeout;
- struct sysdb_ctx *sysdb;
const char *orig_dn;
char *base_filter;
@@ -243,7 +239,6 @@ automntmaps_process_members_send(TALLOC_CTX *mem_ctx,
struct sss_domain_info *dom,
struct sdap_search_base **search_bases,
int timeout,
- struct sysdb_ctx *sysdb,
struct sysdb_attrs *map)
{
errno_t ret;
@@ -258,7 +253,6 @@ automntmaps_process_members_send(TALLOC_CTX *mem_ctx,
state->opts = opts;
state->dom = dom;
state->sh = sh;
- state->sysdb = sysdb;
state->timeout = timeout;
state->base_iter = 0;
state->map = map;
@@ -429,7 +423,6 @@ struct sdap_get_automntmap_state {
struct sdap_options *opts;
struct sdap_handle *sh;
struct sss_domain_info *dom;
- struct sysdb_ctx *sysdb;
const char **attrs;
const char *base_filter;
char *filter;
@@ -456,7 +449,6 @@ static struct tevent_req *
sdap_get_automntmap_send(TALLOC_CTX *memctx,
struct tevent_context *ev,
struct sss_domain_info *dom,
- struct sysdb_ctx *sysdb,
struct sdap_options *opts,
struct sdap_search_base **search_bases,
struct sdap_handle *sh,
@@ -475,7 +467,6 @@ sdap_get_automntmap_send(TALLOC_CTX *memctx,
state->opts = opts;
state->dom = dom;
state->sh = sh;
- state->sysdb = sysdb;
state->attrs = attrs;
state->higher_timestamp = NULL;
state->map = NULL;
@@ -577,7 +568,7 @@ sdap_get_automntmap_process(struct tevent_req *subreq)
subreq = automntmaps_process_members_send(state, state->ev, state->opts,
state->sh, state->dom,
state->search_bases,
- state->timeout, state->sysdb,
+ state->timeout,
state->map[0]);
if (!subreq) {
tevent_req_error(req, ENOMEM);
@@ -716,7 +707,7 @@ sdap_autofs_setautomntent_send(TALLOC_CTX *memctx,
}
subreq = sdap_get_automntmap_send(state, ev, dom,
- sysdb, state->opts,
+ state->opts,
state->opts->sdom->autofs_search_bases,
state->sh,
state->attrs, state->filter,
@@ -832,7 +823,6 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
}
ldap_entrylist[j] = sysdb_autofsentry_strdn(ldap_entrylist,
- state->sysdb,
state->dom,
state->mapname,
key, val);
@@ -857,8 +847,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
ldap_entrylist[state->entries_count] = NULL;
}
- ret = sysdb_autofs_entries_by_map(tmp_ctx, state->sysdb,
- state->dom, state->mapname,
+ ret = sysdb_autofs_entries_by_map(tmp_ctx, state->dom, state->mapname,
&count, &entries);
if (ret != EOK && ret != ENOENT) {
DEBUG(SSSDBG_OP_FAILURE,
@@ -907,7 +896,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
in_transaction = true;
/* Save the map itself */
- ret = save_autofs_map(state->sysdb, state->dom, state->opts, state->map);
+ ret = save_autofs_map(state->dom, state->opts, state->map);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
("Cannot save autofs map entry [%d]: %s\n",
@@ -917,7 +906,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
/* Create entries that don't exist yet */
if (add_entries && add_entries[0]) {
- ret = save_autofs_entries(state->sysdb, state->dom, state->opts,
+ ret = save_autofs_entries(state->dom, state->opts,
state->mapname, add_entries,
entry_hash);
if (ret != EOK) {
@@ -930,7 +919,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
/* Delete entries that don't exist anymore */
if (del_entries && del_entries[0]) {
- ret = del_autofs_entries(state->sysdb, state->opts,
+ ret = del_autofs_entries(state->dom, state->opts,
state->mapname, del_entries);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
diff --git a/src/providers/ldap/sdap_autofs.c b/src/providers/ldap/sdap_autofs.c
index c0bf3b689..3bee9a67f 100644
--- a/src/providers/ldap/sdap_autofs.c
+++ b/src/providers/ldap/sdap_autofs.c
@@ -111,8 +111,7 @@ void sdap_autofs_handler(struct be_req *be_req)
}
if (autofs_req->invalidate) {
- ret = sysdb_invalidate_autofs_maps(id_ctx->be->domain->sysdb,
- id_ctx->be->domain);
+ ret = sysdb_invalidate_autofs_maps(id_ctx->be->domain);
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE, ("Could not invalidate autofs maps, "
"backend might return stale entries\n"));
@@ -270,8 +269,7 @@ sdap_autofs_get_map_done(struct tevent_req *subreq)
}
if (ret == ENOENT) {
- ret = sysdb_delete_autofsmap(state->ctx->be->domain->sysdb,
- state->ctx->be->domain, state->map_name);
+ ret = sysdb_delete_autofsmap(state->ctx->be->domain, state->map_name);
if (ret != EOK && ret != ENOENT) {
DEBUG(SSSDBG_OP_FAILURE,
("Cannot delete autofs map %s [%d]: %s\n",
diff --git a/src/responder/autofs/autofssrv_cmd.c b/src/responder/autofs/autofssrv_cmd.c
index e9168ea8f..56f3d9bd1 100644
--- a/src/responder/autofs/autofssrv_cmd.c
+++ b/src/responder/autofs/autofssrv_cmd.c
@@ -654,7 +654,7 @@ lookup_automntmap_step(struct setautomntent_lookup_ctx *lookup_ctx)
/* Look into the cache */
talloc_free(dctx->map);
- ret = sysdb_get_map_byname(dctx, sysdb, dom, lookup_ctx->mapname,
+ ret = sysdb_get_map_byname(dctx, dom, lookup_ctx->mapname,
&dctx->map);
if (ret != EOK && ret != ENOENT) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not check cache\n"));
@@ -706,7 +706,7 @@ lookup_automntmap_step(struct setautomntent_lookup_ctx *lookup_ctx)
/* OK, the map is in cache and valid.
* Let's get all members and return it
*/
- ret = sysdb_autofs_entries_by_map(map, sysdb, dom, map->mapname,
+ ret = sysdb_autofs_entries_by_map(map, dom, map->mapname,
&map->entry_count,
&map->entries);
if (ret != EOK && ret != ENOENT) {
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 1c28526e0..4caf7e981 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -4788,8 +4788,7 @@ START_TEST(test_autofs_create_map)
autofsmapname = talloc_asprintf(test_ctx, "testmap%d", _i);
fail_if(autofsmapname == NULL, "Out of memory\n");
- ret = sysdb_save_autofsmap(test_ctx->sysdb,
- test_ctx->domain, autofsmapname,
+ ret = sysdb_save_autofsmap(test_ctx->domain, autofsmapname,
autofsmapname, NULL, 0, 0);
fail_if(ret != EOK, "Could not store autofs map %s", autofsmapname);
talloc_free(test_ctx);
@@ -4809,7 +4808,7 @@ START_TEST(test_autofs_retrieve_map)
autofsmapname = talloc_asprintf(test_ctx, "testmap%d", _i);
fail_if(autofsmapname == NULL, "Out of memory\n");
- ret = sysdb_get_map_byname(test_ctx, test_ctx->sysdb, test_ctx->domain,
+ ret = sysdb_get_map_byname(test_ctx, test_ctx->domain,
autofsmapname, &map);
fail_if(ret != EOK, "Could not retrieve autofs map %s", autofsmapname);
fail_if(map == NULL, "No map retrieved?\n");
@@ -4829,8 +4828,7 @@ START_TEST(test_autofs_delete_map)
autofsmapname = talloc_asprintf(test_ctx, "testmap%d", _i);
fail_if(autofsmapname == NULL, "Out of memory\n");
- ret = sysdb_delete_autofsmap(test_ctx->sysdb,
- test_ctx->domain, autofsmapname);
+ ret = sysdb_delete_autofsmap(test_ctx->domain, autofsmapname);
fail_if(ret != EOK, "Could not retrieve autofs map %s", autofsmapname);
talloc_free(test_ctx);
}
@@ -4849,7 +4847,7 @@ START_TEST(test_autofs_retrieve_map_neg)
autofsmapname = talloc_asprintf(test_ctx, "testmap%d", _i);
fail_if(autofsmapname == NULL, "Out of memory\n");
- ret = sysdb_get_map_byname(test_ctx, test_ctx->sysdb, test_ctx->domain,
+ ret = sysdb_get_map_byname(test_ctx, test_ctx->domain,
autofsmapname, &map);
fail_if(ret != ENOENT, "Expected ENOENT, got %d instead\n", ret);
fail_if(map != NULL, "Unexpected map found\n");
@@ -4881,7 +4879,7 @@ START_TEST(test_autofs_store_entry_in_map)
autofsval = talloc_asprintf(test_ctx, "testserver:/testval%d", ii);
fail_if(autofsval == NULL, "Out of memory\n");
- ret = sysdb_save_autofsentry(test_ctx->sysdb, test_ctx->domain,
+ ret = sysdb_save_autofsentry(test_ctx->domain,
autofsmapname, autofskey,
autofsval, NULL);
fail_if(ret != EOK, "Could not save autofs entry %s", autofskey);
@@ -4906,8 +4904,7 @@ START_TEST(test_autofs_retrieve_keys_by_map)
autofsmapname = talloc_asprintf(test_ctx, "testmap%d", _i);
fail_if(autofsmapname == NULL, "Out of memory\n");
- ret = sysdb_autofs_entries_by_map(test_ctx,
- test_ctx->sysdb, test_ctx->domain,
+ ret = sysdb_autofs_entries_by_map(test_ctx, test_ctx->domain,
autofsmapname, &count, &entries);
fail_if(ret != EOK, "Cannot get autofs entries for map %s\n",
autofsmapname);
@@ -4937,7 +4934,7 @@ START_TEST(test_autofs_key_duplicate)
autofsval = talloc_asprintf(test_ctx, "testserver:/testval%d", _i);
fail_if(autofsval == NULL, "Out of memory\n");
- ret = sysdb_save_autofsentry(test_ctx->sysdb, test_ctx->domain,
+ ret = sysdb_save_autofsentry(test_ctx->domain,
autofsmapname, autofskey,
autofsval, NULL);
fail_if(ret != EOK, "Could not save autofs entry %s", autofskey);
diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index fa2e29de8..73e276303 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -443,7 +443,7 @@ static errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
sys_attrs, SYSDB_MOD_REP);
break;
case TYPE_AUTOFSMAP:
- ret = sysdb_set_autofsmap_attr(sysdb, domain, name,
+ ret = sysdb_set_autofsmap_attr(domain, name,
sys_attrs, SYSDB_MOD_REP);
break;
default:
generated by cgit (git 2.34.1) at 2024-05-21 22:10:15 +0000