diff options
Diffstat (limited to 'src/providers')
25 files changed, 68 insertions, 82 deletions
diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index f067b7021..d1574e642 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -704,7 +704,7 @@ errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain, filter, HBAC_RULES_SUBDIR, attrs, &rule_count, &msgs); if (ret != EOK && ret != ENOENT) { diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index e539b29d2..a37db7554 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -78,8 +78,7 @@ ipa_hbac_save_list(struct sss_domain_info *domain, } DEBUG(9, ("Object name: [%s].\n", object_name)); - ret = sysdb_store_custom(domain->sysdb, domain, - object_name, subdir, list[c]); + ret = sysdb_store_custom(domain, object_name, subdir, list[c]); if (ret != EOK) { DEBUG(1, ("sysdb_store_custom failed.\n")); goto done; diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c index e85206e8f..dbc02b865 100644 --- a/src/providers/ipa/ipa_hbac_hosts.c +++ b/src/providers/ipa/ipa_hbac_hosts.c @@ -114,7 +114,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, } /* First check if this is a specific host */ - ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain, filter, HBAC_HOSTS_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; @@ -150,7 +150,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, num_hosts++; } else { /* ret == ENOENT */ /* Check if this is a hostgroup */ - ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain, filter, HBAC_HOSTGROUPS_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c index ace01fae2..b1cc524da 100644 --- a/src/providers/ipa/ipa_hbac_services.c +++ b/src/providers/ipa/ipa_hbac_services.c @@ -465,7 +465,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, } /* First check if this is a specific service */ - ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain, filter, HBAC_SERVICES_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; @@ -500,7 +500,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, num_services++; } else { /* ret == ENOENT */ /* Check if this is a service group */ - ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain, filter, HBAC_SERVICEGROUPS_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c index a5fcaad4e..cd56e1913 100644 --- a/src/providers/ipa/ipa_hbac_users.c +++ b/src/providers/ipa/ipa_hbac_users.c @@ -225,7 +225,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, } /* First check if this is a user */ - ret = sysdb_search_users(tmp_ctx, domain->sysdb, domain, + ret = sysdb_search_users(tmp_ctx, domain, filter, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; if (ret == EOK && count == 0) { @@ -258,8 +258,8 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, num_users++; } else { /* Check if it is a group instead */ - ret = sysdb_search_groups(tmp_ctx, domain->sysdb, domain, - filter, attrs, &count, &msgs); + ret = sysdb_search_groups(tmp_ctx, domain, filter, attrs, + &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; if (ret == EOK && count == 0) { ret = ENOENT; diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c index 6e0964400..56b8c9f05 100644 --- a/src/providers/ipa/ipa_id.c +++ b/src/providers/ipa/ipa_id.c @@ -309,7 +309,7 @@ static void ipa_id_get_netgroup_done(struct tevent_req *subreq) } if (ret == ENOENT) { - ret = sysdb_delete_netgroup(state->sysdb, state->domain, state->name); + ret = sysdb_delete_netgroup(state->domain, state->name); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c index 0deb3944e..245930b10 100644 --- a/src/providers/ipa/ipa_netgroups.c +++ b/src/providers/ipa/ipa_netgroups.c @@ -171,7 +171,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, DEBUG(6, ("Storing info for netgroup %s\n", name)); - ret = sysdb_add_netgroup(ctx, dom, name, NULL, netgroup_attrs, NULL, + ret = sysdb_add_netgroup(dom, name, NULL, netgroup_attrs, NULL, dom->netgroup_timeout, 0); if (ret) goto fail; diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c index e7dbeb459..7379b99e5 100644 --- a/src/providers/ipa/ipa_s2n_exop.c +++ b/src/providers/ipa/ipa_s2n_exop.c @@ -830,7 +830,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) gid = attrs->a.user.pw_gid; } - ret = sysdb_store_user(state->dom->sysdb, state->dom, name, NULL, + ret = sysdb_store_user(state->dom, name, NULL, attrs->a.user.pw_uid, gid, NULL, /* gecos */ homedir, NULL, NULL, user_attrs, NULL, @@ -886,9 +886,8 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) } } - ret = sysdb_store_group(state->dom->sysdb, state->dom, name, - attrs->a.group.gr_gid, group_attrs, - timeout, now); + ret = sysdb_store_group(state->dom, name, attrs->a.group.gr_gid, + group_attrs, timeout, now); break; default: DEBUG(SSSDBG_OP_FAILURE, ("Unexpected response type [%d].\n", diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c index 24f691bdf..7a65c1181 100644 --- a/src/providers/ipa/ipa_subdomains_ext_groups.c +++ b/src/providers/ipa/ipa_subdomains_ext_groups.c @@ -340,8 +340,8 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, goto done; } - ret = sysdb_search_groups(tmp_ctx, group_dom->sysdb, group_dom, - subfilter, NULL, &msgs_count, &msgs); + ret = sysdb_search_groups(tmp_ctx, group_dom, subfilter, NULL, + &msgs_count, &msgs); if (ret != EOK) { if (ret == ENOENT) { DEBUG(SSSDBG_TRACE_ALL, ("Group [%s] not in the cache.\n", @@ -357,7 +357,7 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, /* TODO? Do we have to remove members as well? I think not because the AD * query before removes all memberships. */ - ret = sysdb_mod_group_member(group_dom->sysdb, user_dn, msgs[0]->dn, + ret = sysdb_mod_group_member(group_dom, user_dn, msgs[0]->dn, LDB_FLAG_MOD_ADD); if (ret != EOK && ret != EEXIST) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_mod_group_member failed.\n")); diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index a1774ba05..fc7c79c6c 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -270,7 +270,7 @@ static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx, return; } - ret = sysdb_cache_auth(sysdb, domain, pd->user, + ret = sysdb_cache_auth(domain, pd->user, password, cdb, true, NULL, NULL); if (ret != EOK) { DEBUG(1, ("Offline authentication failed\n")); @@ -373,7 +373,7 @@ static void krb5_auth_store_creds(struct sysdb_ctx *sysdb, return; } - ret = sysdb_cache_password(sysdb, domain, pd->user, password); + ret = sysdb_cache_password(domain, pd->user, password); if (ret) { DEBUG(2, ("Failed to cache password, offline auth may not work." " (%d)[%s]!?\n", ret, strerror(ret))); diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index b88f7db33..7cf17376f 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -1121,8 +1121,8 @@ static void sdap_pam_auth_done(struct tevent_req *req) ret = sss_authtok_get_password(state->pd->authtok, &password, NULL); if (ret == EOK) { - ret = sysdb_cache_password(be_ctx->domain->sysdb, be_ctx->domain, - state->pd->user, password); + ret = sysdb_cache_password(be_ctx->domain, state->pd->user, + password); } /* password caching failures are not fatal errors */ diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 793bc99eb..b92f07dd0 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -345,8 +345,7 @@ static void users_get_done(struct tevent_req *subreq) tevent_req_error(req, ret); return; case BE_FILTER_NAME: - ret = sysdb_delete_user(state->sysdb, - state->domain, state->name, 0); + ret = sysdb_delete_user(state->domain, state->name, 0); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -360,7 +359,7 @@ static void users_get_done(struct tevent_req *subreq) return; } - ret = sysdb_delete_user(state->sysdb, state->domain, NULL, uid); + ret = sysdb_delete_user(state->domain, NULL, uid); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -680,8 +679,7 @@ static void groups_get_done(struct tevent_req *subreq) tevent_req_error(req, ret); return; case BE_FILTER_NAME: - ret = sysdb_delete_group(state->sysdb, - state->domain, state->name, 0); + ret = sysdb_delete_group(state->domain, state->name, 0); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -695,8 +693,7 @@ static void groups_get_done(struct tevent_req *subreq) return; } - ret = sysdb_delete_group(state->sysdb, - state->domain, NULL, gid); + ret = sysdb_delete_group(state->domain, NULL, gid); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; @@ -891,8 +888,7 @@ static void groups_by_user_done(struct tevent_req *subreq) } if (ret == ENOENT && state->noexist_delete == true) { - ret = sysdb_delete_user(state->ctx->be->domain->sysdb, - state->ctx->be->domain, state->name, 0); + ret = sysdb_delete_user(state->ctx->be->domain, state->name, 0); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c index 36ef6f420..513ad9545 100644 --- a/src/providers/ldap/ldap_id_cleanup.c +++ b/src/providers/ldap/ldap_id_cleanup.c @@ -172,7 +172,6 @@ static int cleanup_users(struct sdap_options *opts, struct sss_domain_info *dom) { TALLOC_CTX *tmpctx; - struct sysdb_ctx *sysdb = dom->sysdb; const char *attrs[] = { SYSDB_NAME, SYSDB_UIDNUM, NULL }; time_t now = time(NULL); char *subfilter = NULL; @@ -216,8 +215,7 @@ static int cleanup_users(struct sdap_options *opts, goto done; } - ret = sysdb_search_users(tmpctx, sysdb, dom, - subfilter, attrs, &count, &msgs); + ret = sysdb_search_users(tmpctx, dom, subfilter, attrs, &count, &msgs); if (ret) { if (ret == ENOENT) { ret = EOK; @@ -263,7 +261,7 @@ static int cleanup_users(struct sdap_options *opts, /* If not logged in or cannot check the table, delete him */ DEBUG(9, ("About to delete user %s\n", name)); - ret = sysdb_delete_user(sysdb, dom, name, 0); + ret = sysdb_delete_user(dom, name, 0); if (ret) { goto done; } @@ -338,8 +336,7 @@ static int cleanup_groups(TALLOC_CTX *memctx, goto done; } - ret = sysdb_search_groups(tmpctx, sysdb, domain, - subfilter, attrs, &count, &msgs); + ret = sysdb_search_groups(tmpctx, domain, subfilter, attrs, &count, &msgs); if (ret) { if (ret == ENOENT) { ret = EOK; @@ -403,7 +400,7 @@ static int cleanup_groups(TALLOC_CTX *memctx, } DEBUG(8, ("About to delete group %s\n", name)); - ret = sysdb_delete_group(sysdb, domain, name, 0); + ret = sysdb_delete_group(domain, name, 0); if (ret) { DEBUG(2, ("Group delete returned %d (%s)\n", ret, strerror(ret))); diff --git a/src/providers/ldap/ldap_id_netgroup.c b/src/providers/ldap/ldap_id_netgroup.c index e48a7da6c..3f40d89e6 100644 --- a/src/providers/ldap/ldap_id_netgroup.c +++ b/src/providers/ldap/ldap_id_netgroup.c @@ -215,7 +215,7 @@ static void ldap_netgroup_get_done(struct tevent_req *subreq) } if (ret == ENOENT && state->noexist_delete == true) { - ret = sysdb_delete_netgroup(state->sysdb, state->domain, state->name); + ret = sysdb_delete_netgroup(state->domain, state->name); if (ret != EOK && ret != ENOENT) { tevent_req_error(req, ret); return; diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index 1f008e20f..a943663ec 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -114,7 +114,7 @@ sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, return ENOMEM; } - ret = sysdb_search_users(mem_ctx, sysdb, domain, filter, + ret = sysdb_search_users(mem_ctx, domain, filter, search_attrs, &count, &msgs); talloc_free(filter); if (ret == ENOENT) { @@ -301,8 +301,8 @@ sdap_store_group_with_gid(struct sysdb_ctx *ctx, } } - ret = sysdb_store_group(ctx, domain, name, gid, - group_attrs, cache_timeout, now); + ret = sysdb_store_group(domain, name, gid, group_attrs, + cache_timeout, now); if (ret) { DEBUG(2, ("Could not store group %s\n", name)); return ret; @@ -743,7 +743,7 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, } } - ret = sysdb_store_group(ctx, dom, group_name, 0, group_attrs, + ret = sysdb_store_group(dom, group_name, 0, group_attrs, dom->group_timeout, now); if (ret) goto fail; @@ -1252,7 +1252,7 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state, goto done; } - ret = sysdb_search_users(tmp_ctx, state->sysdb, state->dom, filter, + ret = sysdb_search_users(tmp_ctx, state->dom, filter, attrs, &count, &msgs); if (ret == EOK && count > 0) { /* Entry exists but the group references it with an alias. */ @@ -2111,7 +2111,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - ret = sysdb_search_users(tmp_ctx, user_dom->sysdb, user_dom, filter, + ret = sysdb_search_users(tmp_ctx, domain, filter, search_attrs, &count, &msgs); talloc_zfree(filter); talloc_zfree(clean_orig_dn); diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index a3c879f2f..e869ea016 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -195,7 +195,7 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding fake group %s to sysdb\n", groupname)); - ret = sysdb_add_incomplete_group(sysdb, domain, groupname, gid, + ret = sysdb_add_incomplete_group(domain, groupname, gid, original_dn, sid_str, posix, now); if (ret != EOK) { @@ -297,7 +297,7 @@ int sdap_initgr_common_store(struct sysdb_ctx *sysdb, } DEBUG(8, ("Updating memberships for %s\n", name)); - ret = sysdb_update_members(sysdb, domain, name, type, + ret = sysdb_update_members(domain, name, type, (const char *const *) add_groups, (const char *const *) del_groups); if (ret != EOK) { @@ -1118,7 +1118,7 @@ sdap_initgr_store_group_memberships(struct sdap_initgr_nested_state *state) in_transaction = true; DLIST_FOR_EACH(miter, memberships) { - ret = sysdb_update_members(state->sysdb, state->dom, miter->name, + ret = sysdb_update_members(state->dom, miter->name, SYSDB_MEMBER_GROUP, (const char *const *) miter->add, (const char *const *) miter->del); @@ -1245,8 +1245,7 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) in_transaction = true; DEBUG(8, ("Updating memberships for %s\n", state->username)); - ret = sysdb_update_members(state->sysdb, state->dom, - state->username, SYSDB_MEMBER_USER, + ret = sysdb_update_members(state->dom, state->username, SYSDB_MEMBER_USER, (const char *const *) add_groups, (const char *const *) del_groups); if (ret != EOK) { @@ -1923,7 +1922,7 @@ save_rfc2307bis_group_memberships(struct sdap_initgr_rfc2307bis_state *state) } else { add[num_added] = NULL; } - ret = sysdb_update_members(state->sysdb, state->dom, iter->name, + ret = sysdb_update_members(state->dom, iter->name, SYSDB_MEMBER_GROUP, (const char *const *) add, (const char *const *) iter->del); @@ -2083,8 +2082,7 @@ errno_t save_rfc2307bis_user_memberships( } DEBUG(8, ("Updating memberships for %s\n", state->name)); - ret = sysdb_update_members(state->sysdb, state->dom, - state->name, SYSDB_MEMBER_USER, + ret = sysdb_update_members(state->dom, state->name, SYSDB_MEMBER_USER, (const char *const *)add_groups, (const char *const *)del_groups); if (ret != EOK) { diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index d23cbd7cd..7824f0b98 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -504,8 +504,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq) */ group_name = sid_str; - ret = sysdb_add_incomplete_group(group_domain->sysdb, - group_domain, + ret = sysdb_add_incomplete_group(group_domain, group_name, gid, NULL, sid_str, false, now); if (ret != EOK) { @@ -573,7 +572,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq) DEBUG(SSSDBG_TRACE_LIBS, ("Updating memberships for [%s]\n", state->username)); - ret = sysdb_update_members_dn(state->sysdb, state->domain, + ret = sysdb_update_members_dn(state->domain, state->username, SYSDB_MEMBER_USER, (const char *const *) add_groups, (const char *const *) del_groups); diff --git a/src/providers/ldap/sdap_async_nested_groups.c b/src/providers/ldap/sdap_async_nested_groups.c index 3338d173e..2ff1ecb7b 100644 --- a/src/providers/ldap/sdap_async_nested_groups.c +++ b/src/providers/ldap/sdap_async_nested_groups.c @@ -286,10 +286,10 @@ static errno_t sdap_nested_group_sysdb_search(struct sss_domain_info *domain, errno_t ret; if (user) { - ret = sysdb_search_users(NULL, domain->sysdb, domain, filter, attrs, + ret = sysdb_search_users(NULL, domain, filter, attrs, &count, &msgs); } else { - ret = sysdb_search_groups(NULL, domain->sysdb, domain, filter, attrs, + ret = sysdb_search_groups(NULL, domain, filter, attrs, &count, &msgs); } if (ret != EOK) { diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c index b47b3e590..19bcc3f48 100644 --- a/src/providers/ldap/sdap_async_netgroups.c +++ b/src/providers/ldap/sdap_async_netgroups.c @@ -138,7 +138,7 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, goto fail; } - ret = sysdb_add_netgroup(ctx, dom, name, NULL, netgroup_attrs, missing, + ret = sysdb_add_netgroup(dom, name, NULL, netgroup_attrs, missing, dom->netgroup_timeout, now); if (ret) goto fail; diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index 9cfe21748..488df5120 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -464,7 +464,7 @@ int sdap_save_user(TALLOC_CTX *memctx, DEBUG(SSSDBG_TRACE_FUNC, ("Storing info for user %s\n", user_name)); - ret = sysdb_store_user(ctx, dom, user_name, pwd, uid, gid, + ret = sysdb_store_user(dom, user_name, pwd, uid, gid, gecos, homedir, shell, orig_dn, user_attrs, missing, cache_timeout, now); if (ret) goto done; diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c index 66d73102e..51da8128d 100644 --- a/src/providers/ldap/sdap_reinit.c +++ b/src/providers/ldap/sdap_reinit.c @@ -144,7 +144,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, in_transaction = true; /* reset users' usn */ - ret = sysdb_search_users(tmp_ctx, sysdb, domain, + ret = sysdb_search_users(tmp_ctx, domain, "", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; @@ -154,8 +154,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, msgs_num = 0; /* reset groups' usn */ - ret = sysdb_search_groups(tmp_ctx, sysdb, domain, - "", attrs, &msgs_num, &msgs); + ret = sysdb_search_groups(tmp_ctx, domain, "", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; } @@ -276,7 +275,7 @@ static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain) in_transaction = true; /* purge untouched users */ - ret = sysdb_search_users(tmp_ctx, sysdb, domain, "(!("SYSDB_USN"=*))", + ret = sysdb_search_users(tmp_ctx, domain, "(!("SYSDB_USN"=*))", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; @@ -286,7 +285,7 @@ static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain) msgs_num = 0; /* purge untouched groups */ - ret = sysdb_search_groups(tmp_ctx, sysdb, domain, "(!("SYSDB_USN"=*))", + ret = sysdb_search_groups(tmp_ctx, domain, "(!("SYSDB_USN"=*))", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c index 61fec63aa..fa766dc4e 100644 --- a/src/providers/proxy/proxy_auth.c +++ b/src/providers/proxy/proxy_auth.c @@ -757,8 +757,7 @@ static void proxy_child_done(struct tevent_req *req) goto done; } - ret = sysdb_cache_password(be_ctx->domain->sysdb, be_ctx->domain, - pd->user, password); + ret = sysdb_cache_password(be_ctx->domain, pd->user, password); /* password caching failures are not fatal errors */ /* so we just log it any return */ diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 998b161db..503e325a4 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -209,7 +209,7 @@ delete_user(struct sysdb_ctx *sysdb, DEBUG(SSSDBG_TRACE_FUNC, ("User %s does not exist (or is invalid) on remote server," " deleting!\n", name)); - ret = sysdb_delete_user(sysdb, domain, name, uid); + ret = sysdb_delete_user(domain, name, uid); if (ret == ENOENT) { ret = EOK; } @@ -279,7 +279,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, } } - ret = sysdb_store_user(sysdb, domain, + ret = sysdb_store_user(domain, real_name, pwd->pw_passwd, pwd->pw_uid, @@ -626,7 +626,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, } } - ret = sysdb_store_group(sysdb, dom, + ret = sysdb_store_group(dom, real_name, grp->gr_gid, attrs, @@ -883,7 +883,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, ("Group %s does not exist (or is invalid) on remote server," " deleting!\n", name)); - ret = sysdb_delete_group(sysdb, dom, NULL, gid); + ret = sysdb_delete_group(dom, NULL, gid); if (ret == ENOENT) { ret = EOK; } @@ -961,7 +961,7 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, ("Group %"SPRIgid" does not exist (or is invalid) on remote " "server, deleting!\n", gid)); - ret = sysdb_delete_group(sysdb, dom, NULL, gid); + ret = sysdb_delete_group(dom, NULL, gid); if (ret == ENOENT) { ret = EOK; } diff --git a/src/providers/proxy/proxy_netgroup.c b/src/providers/proxy/proxy_netgroup.c index 04a0b18d7..a201b2607 100644 --- a/src/providers/proxy/proxy_netgroup.c +++ b/src/providers/proxy/proxy_netgroup.c @@ -91,8 +91,8 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, } } - ret = sysdb_add_netgroup(sysdb, domain, name, NULL, - attrs, NULL, cache_timeout, 0); + ret = sysdb_add_netgroup(domain, name, NULL, attrs, NULL, + cache_timeout, 0); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); return ret; @@ -101,7 +101,7 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, return EOK; } -static errno_t handle_error(enum nss_status status, struct sysdb_ctx *sysdb, +static errno_t handle_error(enum nss_status status, struct sss_domain_info *domain, const char *name) { errno_t ret; @@ -114,7 +114,7 @@ static errno_t handle_error(enum nss_status status, struct sysdb_ctx *sysdb, case NSS_STATUS_NOTFOUND: DEBUG(SSSDBG_MINOR_FAILURE, ("The netgroup was not found\n")); - ret = sysdb_delete_netgroup(sysdb, domain, name); + ret = sysdb_delete_netgroup(domain, name); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot delete netgroup: %d\n", ret)); ret = EIO; @@ -153,7 +153,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, if (status != NSS_STATUS_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, ("setnetgrent failed for netgroup [%s].\n", name)); - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); goto done; } @@ -176,7 +176,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, if (status != NSS_STATUS_SUCCESS && status != NSS_STATUS_RETURN && status != NSS_STATUS_NOTFOUND) { - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); DEBUG(SSSDBG_OP_FAILURE, ("getnetgrent_r failed for netgroup [%s]: [%d][%s].\n", name, ret, strerror(ret))); @@ -195,7 +195,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, status = ctx->ops.endnetgrent(&result); if (status != NSS_STATUS_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, ("endnetgrent failed.\n")); - ret = handle_error(status, sysdb, dom, name); + ret = handle_error(status, dom, name); goto done; } @@ -203,7 +203,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, !dom->case_sensitive, dom->netgroup_timeout); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, ("save_netgroup failed.\n")); goto done; } diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c index 1decbcb98..912350de2 100644 --- a/src/providers/simple/simple_access_check.c +++ b/src/providers/simple/simple_access_check.c @@ -437,7 +437,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_asq_search(state, state->domain->sysdb, + ret = sysdb_asq_search(state, state->domain, user->dn, NULL, SYSDB_MEMBEROF, attrs, &group_count, &groups); if (ret != EOK) { |