diff options
author | Michal Zidek <mzidek@redhat.com> | 2013-10-08 15:13:58 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-11-15 20:20:18 +0100 |
commit | b3292840ebaa747a9fd596ff47cc5d18198361d0 (patch) | |
tree | 4bd2561d5dcd6c1d8a2eea61846e8763032e4d34 /src/providers/ldap | |
parent | 17759fc794c22898d1db609b736fbcd77536d150 (diff) | |
download | sssd-b3292840ebaa747a9fd596ff47cc5d18198361d0.tar.gz sssd-b3292840ebaa747a9fd596ff47cc5d18198361d0.tar.xz sssd-b3292840ebaa747a9fd596ff47cc5d18198361d0.zip |
SYSDB: Drop the sysdb_ctx parameter from the sysdb_search module
Diffstat (limited to 'src/providers/ldap')
-rw-r--r-- | src/providers/ldap/ldap_auth.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_access.c | 3 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_initgroups.c | 12 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index f9bab4b2b..b88f7db33 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -384,7 +384,7 @@ static int get_user_dn(TALLOC_CTX *memctx, attrs[9] = SYSDB_PWD_ATTRIBUTE; attrs[10] = NULL; - ret = sysdb_get_user_attr(tmpctx, sysdb, domain, username, attrs, &res); + ret = sysdb_get_user_attr(tmpctx, domain, username, attrs, &res); if (ret) { goto done; } diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c index 6b387271a..1934e4f0f 100644 --- a/src/providers/ldap/sdap_access.c +++ b/src/providers/ldap/sdap_access.c @@ -112,8 +112,7 @@ sdap_access_send(TALLOC_CTX *mem_ctx, } /* Get original user DN, domain already points to the right (sub)domain */ - ret = sysdb_get_user_attr(state, domain->sysdb, domain, - pd->user, attrs, &res); + ret = sysdb_get_user_attr(state, domain, pd->user, attrs, &res); if (ret != EOK) { if (ret == ENOENT) { /* If we can't find the user, return access denied */ diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index c16d48495..fa69097fa 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -1222,8 +1222,7 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) } } - ret = sysdb_get_direct_parents(tmp_ctx, state->sysdb, state->dom, - SYSDB_MEMBER_USER, + ret = sysdb_get_direct_parents(tmp_ctx, state->dom, SYSDB_MEMBER_USER, state->username, &sysdb_parent_name_list); if (ret) { DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", @@ -1308,8 +1307,7 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_get_direct_parents(tmp_ctx, sysdb, dom, - SYSDB_MEMBER_GROUP, + ret = sysdb_get_direct_parents(tmp_ctx, dom, SYSDB_MEMBER_GROUP, group_name, &sysdb_parents_names_list); if (ret) { DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", @@ -1977,8 +1975,7 @@ rfc2307bis_group_memberships_build(hash_entry_t *item, void *user_data) goto done; } - ret = sysdb_get_direct_parents(tmp_ctx, mstate->sysdb, mstate->dom, - SYSDB_MEMBER_GROUP, + ret = sysdb_get_direct_parents(tmp_ctx, mstate->dom, SYSDB_MEMBER_GROUP, group_name, &sysdb_parents_names_list); if (ret) { DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", @@ -2038,8 +2035,7 @@ errno_t save_rfc2307bis_user_memberships( } in_transaction = true; - ret = sysdb_get_direct_parents(tmp_ctx, state->sysdb, state->dom, - SYSDB_MEMBER_USER, + ret = sysdb_get_direct_parents(tmp_ctx, state->dom, SYSDB_MEMBER_USER, state->name, &sysdb_parent_name_list); if (ret) { DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", |