diff options
author | Michal Zidek <mzidek@redhat.com> | 2013-10-17 14:17:56 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-11-15 20:20:19 +0100 |
commit | d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb (patch) | |
tree | c0809b3f8bb0a42186c8d07a65e66800b837c313 /src/providers/ldap | |
parent | 6a31a971a376a992afb838fe60b311360c970267 (diff) | |
download | sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.tar.gz sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.tar.xz sssd-d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb.zip |
SYSDB: Drop the sysdb_ctx parameter - module sysdb_ops (part 2)
Diffstat (limited to 'src/providers/ldap')
-rw-r--r-- | src/providers/ldap/ldap_auth.c | 4 | ||||
-rw-r--r-- | src/providers/ldap/ldap_id.c | 14 | ||||
-rw-r--r-- | src/providers/ldap/ldap_id_cleanup.c | 11 | ||||
-rw-r--r-- | src/providers/ldap/ldap_id_netgroup.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_groups.c | 12 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_initgroups.c | 14 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_initgroups_ad.c | 5 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_nested_groups.c | 4 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_netgroups.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_users.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_reinit.c | 9 |
11 files changed, 34 insertions, 45 deletions
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; |