diff options
author | Simo Sorce <simo@redhat.com> | 2013-01-07 23:00:22 -0500 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-01-15 10:53:02 +0100 |
commit | 044868b388b4e47499f12a9105310b247bbe1ce2 (patch) | |
tree | a8e503edd07bdbd598dbc02c448d138520907e29 /src/providers/ldap | |
parent | a703ed242523c145133f522085ee3180452b3743 (diff) | |
download | sssd-044868b388b4e47499f12a9105310b247bbe1ce2.tar.gz sssd-044868b388b4e47499f12a9105310b247bbe1ce2.tar.xz sssd-044868b388b4e47499f12a9105310b247bbe1ce2.zip |
Add domain arg to sysdb_search_users()
Diffstat (limited to 'src/providers/ldap')
-rw-r--r-- | src/providers/ldap/ldap_id_cleanup.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_groups.c | 16 | ||||
-rw-r--r-- | src/providers/ldap/sdap_reinit.c | 23 |
3 files changed, 25 insertions, 16 deletions
diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c index 9c2faabb2..6e138b31b 100644 --- a/src/providers/ldap/ldap_id_cleanup.c +++ b/src/providers/ldap/ldap_id_cleanup.c @@ -290,7 +290,7 @@ static int cleanup_users(TALLOC_CTX *memctx, struct sdap_id_ctx *ctx) goto done; } - ret = sysdb_search_users(tmpctx, sysdb, + ret = sysdb_search_users(tmpctx, sysdb, ctx->be->domain, subfilter, attrs, &count, &msgs); if (ret) { if (ret == ENOENT) { diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index 4fdacae66..fde83ee81 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -94,6 +94,7 @@ done: static errno_t sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, + struct sss_domain_info *domain, gid_t gid, char ***_localdn, size_t *_ndn) { static const char *search_attrs[] = { SYSDB_NAME, NULL }; @@ -113,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, filter, + ret = sysdb_search_users(mem_ctx, sysdb, domain, filter, search_attrs, &count, &msgs); talloc_free(filter); if (ret == ENOENT) { @@ -148,7 +149,8 @@ sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, static errno_t sdap_dn_by_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_attrs *ldap_attrs, - struct sysdb_ctx *sysdb, struct sdap_options *opts, + struct sysdb_ctx *sysdb, struct sss_domain_info *domain, + struct sdap_options *opts, char ***_dn_list, size_t *_count) { gid_t gid; @@ -166,7 +168,7 @@ sdap_dn_by_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_attrs *ldap_attrs, return ret; } - ret = sdap_get_members_with_primary_gid(mem_ctx, sysdb, gid, + ret = sdap_get_members_with_primary_gid(mem_ctx, sysdb, domain, gid, _dn_list, _count); if (ret) return ret; @@ -660,7 +662,7 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, * are reported with tokenGroups, too */ if (opts->schema_type == SDAP_SCHEMA_AD) { - ret = sdap_dn_by_primary_gid(memctx, attrs, ctx, opts, + ret = sdap_dn_by_primary_gid(memctx, attrs, ctx, dom, opts, &userdns, &nuserdns); if (ret != EOK) { goto fail; @@ -1201,7 +1203,7 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state, goto done; } - ret = sysdb_search_users(tmp_ctx, state->sysdb, filter, + ret = sysdb_search_users(tmp_ctx, state->sysdb, state->dom, filter, attrs, &count, &msgs); if (ret == EOK && count > 0) { /* Entry exists but the group references it with an alias. */ @@ -2147,7 +2149,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - ret = sysdb_search_users(tmp_ctx, sysdb, filter, + ret = sysdb_search_users(tmp_ctx, sysdb, domain, filter, search_attrs, &count, &msgs); talloc_zfree(filter); talloc_zfree(clean_orig_dn); @@ -2981,7 +2983,7 @@ sdap_nested_group_check_cache(TALLOC_CTX *mem_ctx, } /* Try users first */ - ret = sysdb_search_users(tmp_ctx, sysdb, filter, attrs, &count, &msgs); + ret = sysdb_search_users(tmp_ctx, sysdb, dom, filter, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) { ret = EIO; goto fail; diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c index 4c75f6c36..cc836ae53 100644 --- a/src/providers/ldap/sdap_reinit.c +++ b/src/providers/ldap/sdap_reinit.c @@ -29,12 +29,15 @@ #include "db/sysdb_services.h" struct sdap_reinit_cleanup_state { + struct sss_domain_info *domain; struct sysdb_ctx *sysdb; }; -static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb); +static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain); static void sdap_reinit_cleanup_done(struct tevent_req *subreq); -static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb); +static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain); struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, @@ -61,6 +64,7 @@ struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx, } state->sysdb = be_ctx->domain->sysdb; + state->domain = be_ctx->domain; if (!be_ctx->domain->enumerate) { /* enumeration is disabled, this whole process is meaningless */ @@ -68,7 +72,7 @@ struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx, goto immediately; } - ret = sdap_reinit_clear_usn(state->sysdb); + ret = sdap_reinit_clear_usn(state->sysdb, state->domain); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to clear USN attributes [%d]: %s\n", ret, strerror(ret))); @@ -115,7 +119,8 @@ static void sdap_delete_msgs_usn(struct sysdb_ctx *sysdb, } } -static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb) +static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain) { TALLOC_CTX *tmp_ctx = NULL; bool in_transaction = false; @@ -138,7 +143,8 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb) in_transaction = true; /* reset users' usn */ - ret = sysdb_search_users(tmp_ctx, sysdb, "", attrs, &msgs_num, &msgs); + ret = sysdb_search_users(tmp_ctx, sysdb, domain, + "", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; } @@ -211,7 +217,7 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) /* This error is non-fatal, so continue */ } - ret = sdap_reinit_delete_records(state->sysdb); + ret = sdap_reinit_delete_records(state->sysdb, state->domain); if (ret != EOK) { goto fail; } @@ -239,7 +245,8 @@ static void sdap_delete_msgs_dn(struct sysdb_ctx *sysdb, } } -static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb) +static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain) { TALLOC_CTX *tmp_ctx = NULL; bool in_transaction = false; @@ -262,7 +269,7 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb) in_transaction = true; /* purge untouched users */ - ret = sysdb_search_users(tmp_ctx, sysdb, "(!("SYSDB_USN"=*))", + ret = sysdb_search_users(tmp_ctx, sysdb, domain, "(!("SYSDB_USN"=*))", attrs, &msgs_num, &msgs); if (ret != EOK) { goto done; |