diff options
Diffstat (limited to 'src')
31 files changed, 99 insertions, 182 deletions
diff --git a/src/db/sysdb.c b/src/db/sysdb.c index da5dbe84c..d86903e5a 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -1816,7 +1816,7 @@ errno_t sysdb_get_real_name(TALLOC_CTX *mem_ctx, return ENOMEM; } - ret = sysdb_getpwnam(tmp_ctx, sysdb, domain, name, &res); + ret = sysdb_getpwnam(tmp_ctx, domain, name, &res); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("Cannot canonicalize username\n")); goto done; diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 4d5ef0b47..b74fa0824 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -411,36 +411,30 @@ int sysdb_domain_init(TALLOC_CTX *mem_ctx, * These functions automatically starts an operation * therefore they cannot be called within a transaction */ int sysdb_getpwnam(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **res); int sysdb_getpwuid(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, uid_t uid, struct ldb_result **res); int sysdb_enumpwent(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, struct ldb_result **res); int sysdb_getgrnam(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **res); int sysdb_getgrgid(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, gid_t gid, struct ldb_result **res); int sysdb_enumgrent(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, struct ldb_result **res); @@ -457,26 +451,22 @@ struct sysdb_netgroup_ctx { }; errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *netgroup, struct ldb_result **res); int sysdb_initgroups(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **res); int sysdb_get_user_attr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, const char **attributes, struct ldb_result **res); int sysdb_get_netgroup_attr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *netgrname, const char **attributes, @@ -855,7 +845,6 @@ errno_t sysdb_remove_attrs(struct sysdb_ctx *sysdb, char **remove_attrs); errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *dom, enum sysdb_member_type mtype, const char *name, diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c index 8dfaf1f2a..99506614b 100644 --- a/src/db/sysdb_search.c +++ b/src/db/sysdb_search.c @@ -28,7 +28,6 @@ /* users */ int sysdb_getpwnam(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **_res) @@ -46,7 +45,7 @@ int sysdb_getpwnam(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_USER_BASE, domain->name); if (!base_dn) { ret = ENOMEM; @@ -66,7 +65,7 @@ int sysdb_getpwnam(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, SYSDB_PWNAM_FILTER, sanitized_name, sanitized_name); if (ret) { @@ -82,7 +81,6 @@ done: } int sysdb_getpwuid(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, uid_t uid, struct ldb_result **_res) @@ -99,14 +97,14 @@ int sysdb_getpwuid(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_USER_BASE, domain->name); if (!base_dn) { ret = ENOMEM; goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, SYSDB_PWUID_FILTER, ul_uid); if (ret) { ret = sysdb_error_to_errno(ret); @@ -121,7 +119,6 @@ done: } int sysdb_enumpwent(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, struct ldb_result **_res) { @@ -136,14 +133,14 @@ int sysdb_enumpwent(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_USER_BASE, domain->name); if (!base_dn) { ret = ENOMEM; goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, SYSDB_PWENT_FILTER); if (ret) { ret = sysdb_error_to_errno(ret); @@ -202,7 +199,6 @@ static int mpg_res_convert(struct ldb_result *res) } int sysdb_getgrnam(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **_res) @@ -223,11 +219,11 @@ int sysdb_getgrnam(TALLOC_CTX *mem_ctx, if (domain->mpg) { fmt_filter = SYSDB_GRNAM_MPG_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRNAM_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_GROUP_BASE, domain->name); } if (!base_dn) { @@ -248,7 +244,7 @@ int sysdb_getgrnam(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, fmt_filter, sanitized_name, sanitized_name); if (ret) { @@ -269,7 +265,6 @@ done: } int sysdb_getgrgid(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, gid_t gid, struct ldb_result **_res) @@ -289,11 +284,11 @@ int sysdb_getgrgid(TALLOC_CTX *mem_ctx, if (domain->mpg) { fmt_filter = SYSDB_GRGID_MPG_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRGID_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_GROUP_BASE, domain->name); } if (!base_dn) { @@ -301,7 +296,7 @@ int sysdb_getgrgid(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, fmt_filter, ul_gid); if (ret) { ret = sysdb_error_to_errno(ret); @@ -321,7 +316,6 @@ done: } int sysdb_enumgrent(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, struct ldb_result **_res) { @@ -339,11 +333,11 @@ int sysdb_enumgrent(TALLOC_CTX *mem_ctx, if (domain->mpg) { fmt_filter = SYSDB_GRENT_MPG_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_DOM_BASE, domain->name); } else { fmt_filter = SYSDB_GRENT_FILTER; - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_GROUP_BASE, domain->name); } if (!base_dn) { @@ -351,7 +345,7 @@ int sysdb_enumgrent(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attrs, "%s", fmt_filter); if (ret) { ret = sysdb_error_to_errno(ret); @@ -371,7 +365,6 @@ done: } int sysdb_initgroups(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, struct ldb_result **_res) @@ -390,7 +383,7 @@ int sysdb_initgroups(TALLOC_CTX *mem_ctx, return ENOMEM; } - ret = sysdb_getpwnam(tmp_ctx, sysdb, domain, name, &res); + ret = sysdb_getpwnam(tmp_ctx, domain, name, &res); if (ret != EOK) { DEBUG(1, ("sysdb_getpwnam failed: [%d][%s]\n", ret, strerror(ret))); @@ -444,7 +437,7 @@ int sysdb_initgroups(TALLOC_CTX *mem_ctx, control->src_attr_len = strlen(control->source_attribute); ctrl[0]->data = control; - ret = ldb_build_search_req(&req, sysdb->ldb, tmp_ctx, + ret = ldb_build_search_req(&req, domain->sysdb->ldb, tmp_ctx, user_dn, LDB_SCOPE_BASE, SYSDB_INITGR_FILTER, attrs, ctrl, res, ldb_search_default_callback, @@ -454,7 +447,7 @@ int sysdb_initgroups(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_request(sysdb->ldb, req); + ret = ldb_request(domain->sysdb->ldb, req); if (ret == LDB_SUCCESS) { ret = ldb_wait(req->handle, LDB_WAIT_ALL); } @@ -471,7 +464,6 @@ done: } int sysdb_get_user_attr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *name, const char **attributes, @@ -488,7 +480,7 @@ int sysdb_get_user_attr(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_USER_BASE, domain->name); if (!base_dn) { ret = ENOMEM; @@ -500,7 +492,7 @@ int sysdb_get_user_attr(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &res, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &res, base_dn, LDB_SCOPE_SUBTREE, attributes, SYSDB_PWNAM_FILTER, sanitized_name, sanitized_name); @@ -771,7 +763,6 @@ done: } errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *netgroup, struct ldb_result **res) @@ -790,7 +781,7 @@ errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_NETGROUP_BASE, domain->name); if (!base_dn) { @@ -810,7 +801,7 @@ errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, goto done; } - lret = ldb_search(sysdb->ldb, tmp_ctx, &result, base_dn, + lret = ldb_search(domain->sysdb->ldb, tmp_ctx, &result, base_dn, LDB_SCOPE_SUBTREE, attrs, SYSDB_NETGR_TRIPLES_FILTER, sanitized_netgroup, sanitized_netgroup, @@ -829,7 +820,6 @@ done: } int sysdb_get_netgroup_attr(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *domain, const char *netgrname, const char **attributes, @@ -846,7 +836,7 @@ int sysdb_get_netgroup_attr(TALLOC_CTX *mem_ctx, return ENOMEM; } - base_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, + base_dn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb, SYSDB_TMPL_NETGROUP_BASE, domain->name); if (!base_dn) { ret = ENOMEM; @@ -858,7 +848,7 @@ int sysdb_get_netgroup_attr(TALLOC_CTX *mem_ctx, goto done; } - ret = ldb_search(sysdb->ldb, tmp_ctx, &result, base_dn, + ret = ldb_search(domain->sysdb->ldb, tmp_ctx, &result, base_dn, LDB_SCOPE_SUBTREE, attributes, SYSDB_NETGR_FILTER, sanitized_netgroup, @@ -875,7 +865,6 @@ done: } errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, struct sss_domain_info *dom, enum sysdb_member_type mtype, const char *name, @@ -925,7 +914,7 @@ errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, goto done; } - basedn = ldb_dn_new_fmt(tmp_ctx, sysdb_ctx_get_ldb(sysdb), + basedn = ldb_dn_new_fmt(tmp_ctx, sysdb_ctx_get_ldb(dom->sysdb), SYSDB_TMPL_GROUP_BASE, dom->name); if (!basedn) { ret = ENOMEM; @@ -934,7 +923,7 @@ errno_t sysdb_get_direct_parents(TALLOC_CTX *mem_ctx, DEBUG(8, ("searching sysdb with filter [%s]\n", member_filter)); - ret = sysdb_search_entry(tmp_ctx, sysdb, basedn, + ret = sysdb_search_entry(tmp_ctx, dom->sysdb, basedn, LDB_SCOPE_SUBTREE, member_filter, group_attrs, &direct_sysdb_count, &direct_sysdb_groups); if (ret == ENOENT) { diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index d0d47f49a..d59186d3e 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -905,8 +905,8 @@ static errno_t be_initgroups_prereq(struct be_req *be_req) const char *tmpstr; int i; - ret = sysdb_initgroups(be_req, be_req->be_ctx->domain->sysdb, - be_req->be_ctx->domain, ar->filter_value, &res); + ret = sysdb_initgroups(be_req, be_req->be_ctx->domain, ar->filter_value, + &res); if (ret && ret != ENOENT) { return ret; } diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c index 7df3dbbb2..24f691bdf 100644 --- a/src/providers/ipa/ipa_subdomains_ext_groups.c +++ b/src/providers/ipa/ipa_subdomains_ext_groups.c @@ -196,8 +196,7 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, return ENOMEM; } - ret = sysdb_initgroups(tmp_ctx, user_dom->sysdb, user_dom, user_name, - &result); + ret = sysdb_initgroups(tmp_ctx, user_dom, user_name, &result); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_initgroups failed.\n")); goto done; diff --git a/src/providers/krb5/krb5_access.c b/src/providers/krb5/krb5_access.c index 479d01517..553635c34 100644 --- a/src/providers/krb5/krb5_access.c +++ b/src/providers/krb5/krb5_access.c @@ -89,8 +89,8 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, attrs[3] = SYSDB_CANONICAL_UPN; attrs[4] = NULL; - ret = sysdb_get_user_attr(state, be_ctx->domain->sysdb, be_ctx->domain, - state->pd->user, attrs, &res); + ret = sysdb_get_user_attr(state, be_ctx->domain, state->pd->user, attrs, + &res); if (ret) { DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); goto done; diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index ce461f5ad..f5a6a2c81 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -532,8 +532,8 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, } kr = state->kr; - ret = sysdb_get_user_attr(state, state->sysdb, state->domain, - state->pd->user, attrs, &res); + ret = sysdb_get_user_attr(state, state->domain, state->pd->user, attrs, + &res); if (ret) { DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); state->pam_status = PAM_SYSTEM_ERR; diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c index cf6d72ad2..47c2dd5b8 100644 --- a/src/providers/krb5/krb5_utils.c +++ b/src/providers/krb5/krb5_utils.c @@ -100,7 +100,7 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb, return ENOMEM; } - ret = sysdb_get_user_attr(tmp_ctx, sysdb, domain, user, attrs, &res); + ret = sysdb_get_user_attr(tmp_ctx, domain, user, attrs, &res); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_user_attr failed.\n")); goto done; 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", diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 963aad2d0..a0db2e56d 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -100,7 +100,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, /* Canonicalize the username in case it was actually an alias */ if (ctx->fast_alias == true) { - ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd); + ret = sysdb_getpwuid(tmpctx, dom, uid, &cached_pwd); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", @@ -836,7 +836,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, /* Canonicalize the group name in case it was actually an alias */ if (ctx->fast_alias == true) { - ret = sysdb_getgrgid(tmpctx, sysdb, dom, gid, &cached_grp); + ret = sysdb_getgrgid(tmpctx, dom, gid, &cached_grp); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", @@ -1206,7 +1206,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, /* Canonicalize the username in case it was actually an alias */ if (ctx->fast_alias == true) { - ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd); + ret = sysdb_getpwuid(tmpctx, dom, uid, &cached_pwd); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", diff --git a/src/python/pysss.c b/src/python/pysss.c index 8f9a20b68..c516cbffe 100644 --- a/src/python/pysss.c +++ b/src/python/pysss.c @@ -255,7 +255,6 @@ static PyObject *py_sss_useradd(PySssLocalObject *self, * sysdb did assign it automatically, do a lookup */ if (tctx->octx->uid == 0 || tctx->octx->gid == 0) { ret = sysdb_getpwnam_sync(tctx, - tctx->sysdb, tctx->octx->name, tctx->octx); if (ret != EOK) { @@ -364,7 +363,6 @@ static PyObject *py_sss_userdel(PySssLocalObject *self, if (tctx->octx->remove_homedir) { ret = sysdb_getpwnam_sync(tctx, - tctx->sysdb, tctx->octx->name, tctx->octx); if (ret != EOK) { diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 99213ee27..ddbdbc709 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -122,7 +122,7 @@ void nss_update_pw_memcache(struct nss_ctx *nctx) now = time(NULL); for (dom = nctx->rctx->domains; dom; dom = get_next_domain(dom, false)) { - ret = sysdb_enumpwent(nctx, dom->sysdb, dom, &res); + ret = sysdb_enumpwent(nctx, dom, &res); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to enumerate users for domain [%s]\n", dom->name)); @@ -701,7 +701,6 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; char *name = NULL; - struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -752,13 +751,12 @@ static int nss_cmd_getpwnam_search(struct nss_dom_ctx *dctx) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } - ret = sysdb_getpwnam(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_getpwnam(cmdctx, dom, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -1233,7 +1231,6 @@ static int nss_cmd_getpwuid_search(struct nss_dom_ctx *dctx) struct nss_cmd_ctx *cmdctx = dctx->cmdctx; struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; - struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; int err; @@ -1267,14 +1264,13 @@ static int nss_cmd_getpwuid_search(struct nss_dom_ctx *dctx) DEBUG(4, ("Requesting info for [%d@%s]\n", cmdctx->id, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); ret = EIO; goto done; } - ret = sysdb_getpwuid(cmdctx, sysdb, dom, cmdctx->id, &dctx->res); + ret = sysdb_getpwuid(cmdctx, dom, cmdctx->id, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); ret = EIO; @@ -1730,7 +1726,6 @@ static errno_t nss_cmd_setpwent_step(struct setent_step_ctx *step_ctx) struct nss_dom_ctx *dctx = step_ctx->dctx; struct getent_ctx *pctx = step_ctx->getent_ctx; struct nss_ctx *nctx = step_ctx->nctx; - struct sysdb_ctx *sysdb; struct ldb_result *res; struct timeval tv; struct tevent_timer *te; @@ -1755,8 +1750,7 @@ static errno_t nss_cmd_setpwent_step(struct setent_step_ctx *step_ctx) DEBUG(6, ("Requesting info for domain [%s]\n", dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } @@ -1793,7 +1787,7 @@ static errno_t nss_cmd_setpwent_step(struct setent_step_ctx *step_ctx) } } - ret = sysdb_enumpwent(dctx, sysdb, dom, &res); + ret = sysdb_enumpwent(dctx, dom, &res); if (ret != EOK) { DEBUG(1, ("Enum from cache failed, skipping domain [%s]\n", dom->name)); @@ -2119,7 +2113,7 @@ void nss_update_gr_memcache(struct nss_ctx *nctx) now = time(NULL); for (dom = nctx->rctx->domains; dom; dom = get_next_domain(dom, false)) { - ret = sysdb_enumgrent(nctx, dom->sysdb, dom, &res); + ret = sysdb_enumgrent(nctx, dom, &res); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to enumerate users for domain [%s]\n", dom->name)); @@ -2594,7 +2588,6 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; char *name = NULL; - struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -2645,13 +2638,12 @@ static int nss_cmd_getgrnam_search(struct nss_dom_ctx *dctx) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } - ret = sysdb_getgrnam(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_getgrnam(cmdctx, dom, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; @@ -2734,7 +2726,6 @@ static int nss_cmd_getgrgid_search(struct nss_dom_ctx *dctx) struct nss_cmd_ctx *cmdctx = dctx->cmdctx; struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; - struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; int err; @@ -2768,14 +2759,13 @@ static int nss_cmd_getgrgid_search(struct nss_dom_ctx *dctx) DEBUG(4, ("Requesting info for [%d@%s]\n", cmdctx->id, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); ret = EIO; goto done; } - ret = sysdb_getgrgid(cmdctx, sysdb, dom, cmdctx->id, &dctx->res); + ret = sysdb_getgrgid(cmdctx, dom, cmdctx->id, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); ret = EIO; @@ -3021,7 +3011,6 @@ static errno_t nss_cmd_setgrent_step(struct setent_step_ctx *step_ctx) struct nss_dom_ctx *dctx = step_ctx->dctx; struct getent_ctx *gctx = step_ctx->getent_ctx; struct nss_ctx *nctx = step_ctx->nctx; - struct sysdb_ctx *sysdb; struct ldb_result *res; struct timeval tv; struct tevent_timer *te; @@ -3046,8 +3035,7 @@ static errno_t nss_cmd_setgrent_step(struct setent_step_ctx *step_ctx) DEBUG(6, ("Requesting info for domain [%s]\n", dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } @@ -3084,7 +3072,7 @@ static errno_t nss_cmd_setgrent_step(struct setent_step_ctx *step_ctx) } } - ret = sysdb_enumgrent(dctx, sysdb, dom, &res); + ret = sysdb_enumgrent(dctx, dom, &res); if (ret != EOK) { DEBUG(1, ("Enum from cache failed, skipping domain [%s]\n", dom->name)); @@ -3413,7 +3401,7 @@ void nss_update_initgr_memcache(struct nss_ctx *nctx, tmp_ctx = talloc_new(NULL); - ret = sysdb_initgroups(tmp_ctx, dom->sysdb, dom, name, &res); + ret = sysdb_initgroups(tmp_ctx, dom, name, &res); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to make request to our cache! [%d][%s]\n", @@ -3598,7 +3586,6 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) struct sss_domain_info *dom = dctx->domain; struct cli_ctx *cctx = cmdctx->cctx; char *name = NULL; - struct sysdb_ctx *sysdb; struct nss_ctx *nctx; int ret; @@ -3649,13 +3636,12 @@ static int nss_cmd_initgroups_search(struct nss_dom_ctx *dctx) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } - ret = sysdb_initgroups(cmdctx, sysdb, dom, name, &dctx->res); + ret = sysdb_initgroups(cmdctx, dom, name, &dctx->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache! [%d][%s]\n", ret, strerror(ret))); diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c index a1c41968d..b21d217ae 100644 --- a/src/responder/nss/nsssrv_netgroup.c +++ b/src/responder/nss/nsssrv_netgroup.c @@ -428,7 +428,6 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) errno_t ret; struct sss_domain_info *dom = step_ctx->dctx->domain; struct getent_ctx *netgr; - struct sysdb_ctx *sysdb; char *name = NULL; uint32_t lifetime; @@ -461,15 +460,13 @@ static errno_t lookup_netgr_step(struct setent_step_ctx *step_ctx) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); return EIO; } /* Look up the netgroup in the cache */ - ret = sysdb_getnetgr(step_ctx->dctx, sysdb, dom, name, - &step_ctx->dctx->res); + ret = sysdb_getnetgr(step_ctx->dctx, dom, name, &step_ctx->dctx->res); if (step_ctx->dctx->res->count > 1) { DEBUG(SSSDBG_FATAL_FAILURE, ("getnetgr call returned more than one result !?!\n")); diff --git a/src/responder/pac/pacsrv_cmd.c b/src/responder/pac/pacsrv_cmd.c index 144f5f584..cf5beaf26 100644 --- a/src/responder/pac/pacsrv_cmd.c +++ b/src/responder/pac/pacsrv_cmd.c @@ -416,8 +416,7 @@ static errno_t pac_user_get_grp_info(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_initgroups(tmp_ctx, sysdb, - pr_ctx->dom, pr_ctx->user_name, &res); + ret = sysdb_initgroups(tmp_ctx, pr_ctx->dom, pr_ctx->user_name, &res); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("sysdb_initgroups failed.\n")); goto done; diff --git a/src/responder/pam/pam_LOCAL_domain.c b/src/responder/pam/pam_LOCAL_domain.c index e7776cba3..4c2de626d 100644 --- a/src/responder/pam/pam_LOCAL_domain.c +++ b/src/responder/pam/pam_LOCAL_domain.c @@ -248,8 +248,8 @@ int LOCAL_pam_handler(struct pam_auth_req *preq) pd->pam_status = PAM_SUCCESS; - ret = sysdb_get_user_attr(lreq, lreq->dbctx, preq->domain, - preq->pd->user, attrs, &res); + ret = sysdb_get_user_attr(lreq, preq->domain, preq->pd->user, attrs, + &res); if (ret != EOK) { DEBUG(1, ("sysdb_get_user_attr failed.\n")); talloc_free(lreq); diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index 32efc4ba8..006c3e227 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -903,7 +903,6 @@ static int pam_check_user_search(struct pam_auth_req *preq) { struct sss_domain_info *dom = preq->domain; char *name = NULL; - struct sysdb_ctx *sysdb; time_t cacheExpire; int ret; struct tevent_req *dpreq; @@ -956,14 +955,13 @@ static int pam_check_user_search(struct pam_auth_req *preq) DEBUG(4, ("Requesting info for [%s@%s]\n", name, dom->name)); - sysdb = dom->sysdb; - if (sysdb == NULL) { + if (dom->sysdb == NULL) { DEBUG(0, ("Fatal: Sysdb CTX not found for this domain!\n")); preq->pd->pam_status = PAM_SYSTEM_ERR; return EFAULT; } - ret = sysdb_getpwnam(preq, sysdb, dom, name, &preq->res); + ret = sysdb_getpwnam(preq, dom, name, &preq->res); if (ret != EOK) { DEBUG(1, ("Failed to make request to our cache!\n")); return EIO; diff --git a/src/responder/ssh/sshsrv_cmd.c b/src/responder/ssh/sshsrv_cmd.c index efa451347..5fab78ee4 100644 --- a/src/responder/ssh/sshsrv_cmd.c +++ b/src/responder/ssh/sshsrv_cmd.c @@ -219,7 +219,6 @@ static errno_t ssh_user_pubkeys_search_next(struct ssh_cmd_ctx *cmd_ctx) { errno_t ret; - struct sysdb_ctx *sysdb; const char *attrs[] = { SYSDB_NAME, SYSDB_SSH_PUBKEY, NULL }; struct ldb_result *res; @@ -227,14 +226,13 @@ ssh_user_pubkeys_search_next(struct ssh_cmd_ctx *cmd_ctx) ("Requesting SSH user public keys for [%s@%s]\n", cmd_ctx->name, cmd_ctx->domain->name)); - sysdb = cmd_ctx->domain->sysdb; - if (sysdb == NULL) { + if (cmd_ctx->domain->sysdb == NULL) { DEBUG(SSSDBG_FATAL_FAILURE, ("Fatal: Sysdb CTX not found for this domain!\n")); return EFAULT; } - ret = sysdb_get_user_attr(cmd_ctx, sysdb, cmd_ctx->domain, + ret = sysdb_get_user_attr(cmd_ctx, cmd_ctx->domain, cmd_ctx->name, attrs, &res); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c index 4a121feb3..e609677cf 100644 --- a/src/responder/sudo/sudosrv_get_sudorules.c +++ b/src/responder/sudo/sudosrv_get_sudorules.c @@ -111,8 +111,7 @@ static errno_t sudosrv_get_user(struct sudo_dom_ctx *dctx) DEBUG(SSSDBG_FUNC_DATA, ("Requesting info about [%s@%s]\n", name, dom->name)); - ret = sysdb_getpwnam(dctx, dctx->domain->sysdb, - dctx->domain, name, &user); + ret = sysdb_getpwnam(dctx, dctx->domain, name, &user); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("Failed to make request to our cache!\n")); diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c index e2e81a65f..61625b022 100644 --- a/src/tests/cmocka/test_nss_srv.c +++ b/src/tests/cmocka/test_nss_srv.c @@ -371,9 +371,8 @@ void test_nss_getpwnam_search(void **state) mock_fill_user(); set_cmd_cb(test_nss_getpwnam_search_check); - ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->sysdb, - nss_test_ctx->tctx->dom, "testuser_search", - &res); + ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->dom, + "testuser_search", &res); assert_int_equal(ret, EOK); assert_int_equal(res->count, 0); @@ -386,9 +385,8 @@ void test_nss_getpwnam_search(void **state) assert_int_equal(ret, EOK); /* test_nss_getpwnam_search_check will check the user attributes */ - ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->sysdb, - nss_test_ctx->tctx->dom, "testuser_search", - &res); + ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->dom, + "testuser_search", &res); assert_int_equal(ret, EOK); assert_int_equal(res->count, 1); } @@ -463,9 +461,8 @@ void test_nss_getpwnam_update(void **state) assert_int_equal(ret, EOK); /* Check the user was updated in the cache */ - ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->sysdb, - nss_test_ctx->tctx->dom, "testuser_update", - &res); + ret = sysdb_getpwnam(nss_test_ctx, nss_test_ctx->tctx->dom, + "testuser_update", &res); assert_int_equal(ret, EOK); assert_int_equal(res->count, 1); diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c index 4caf7e981..29b3be5fa 100644 --- a/src/tests/sysdb-tests.c +++ b/src/tests/sysdb-tests.c @@ -855,7 +855,6 @@ START_TEST (test_sysdb_getpwnam) username = talloc_asprintf(test_ctx, "testuser%d", _i); ret = sysdb_getpwnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, username, &res); if (ret) { @@ -876,7 +875,6 @@ START_TEST (test_sysdb_getpwnam) username = talloc_asprintf(test_ctx, "TESTUSER%d", _i); ret = sysdb_getpwnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, username, &res); if (ret) { @@ -912,7 +910,6 @@ START_TEST (test_sysdb_getgrnam) groupname = talloc_asprintf(test_ctx, "testgroup%d", _i); ret = sysdb_getgrnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, groupname, &res); if (ret) { @@ -935,7 +932,6 @@ START_TEST (test_sysdb_getgrnam) groupname = talloc_asprintf(test_ctx, "TESTGROUP%d", _i); ret = sysdb_getgrnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, groupname, &res); if (ret) { @@ -969,7 +965,6 @@ START_TEST (test_sysdb_getgrgid) } ret = sysdb_getgrgid(test_ctx, - test_ctx->sysdb, test_ctx->domain, _i, &res); if (ret) { @@ -1036,7 +1031,6 @@ START_TEST (test_sysdb_getpwuid) } ret = sysdb_getpwuid(test_ctx, - test_ctx->sysdb, test_ctx->domain, _i, &res); if (ret) { @@ -1078,7 +1072,6 @@ START_TEST (test_sysdb_enumgrent) } ret = sysdb_enumgrent(test_ctx, - test_ctx->sysdb, test_ctx->domain, &res); fail_unless(ret == EOK, @@ -1106,7 +1099,6 @@ START_TEST (test_sysdb_enumpwent) } ret = sysdb_enumpwent(test_ctx, - test_ctx->sysdb, test_ctx->domain, &res); fail_unless(ret == EOK, @@ -1204,7 +1196,6 @@ START_TEST (test_sysdb_remove_attrs) fail_if(username == NULL, "OOM"); ret = sysdb_getpwnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, username, &res); fail_if(ret != EOK, "sysdb_getpwnam failed for username %s (%d: %s)", @@ -1220,7 +1211,6 @@ START_TEST (test_sysdb_remove_attrs) fail_if(ret != EOK, "Removing attributes failed: %d", ret); ret = sysdb_getpwnam(test_ctx, - test_ctx->sysdb, test_ctx->domain, username, &res); fail_if(ret != EOK, "sysdb_getpwnam failed for username %s (%d: %s)", @@ -1248,8 +1238,8 @@ START_TEST (test_sysdb_get_user_attr) username = talloc_asprintf(test_ctx, "testuser%d", _i); - ret = sysdb_get_user_attr(test_ctx, test_ctx->sysdb, - test_ctx->domain, username, attrs, &res); + ret = sysdb_get_user_attr(test_ctx, test_ctx->domain, username, attrs, + &res); if (ret) { fail("Could not get attributes for user %s", username); goto done; @@ -1313,7 +1303,6 @@ START_TEST (test_sysdb_initgroups) username = talloc_asprintf(test_ctx, "testuser%d", _i); ret = sysdb_initgroups(test_ctx, - test_ctx->sysdb, test_ctx->domain, username, &res); fail_if(ret != EOK, "sysdb_initgroups failed\n"); @@ -3485,8 +3474,7 @@ START_TEST(test_group_rename) fromname, grgid, NULL, 0, 0); fail_unless(ret == EOK, "Could not add first group"); - ret = sysdb_getgrnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, fromname, &res); + ret = sysdb_getgrnam(test_ctx, test_ctx->domain, fromname, &res); fail_unless(ret == EOK, "Could not retrieve the group from cache\n"); if (res->count != 1) { fail("Invalid number of replies. Expected 1, got %d", res->count); @@ -3511,8 +3499,7 @@ START_TEST(test_group_rename) toname, grgid, NULL, 0, 0); fail_unless(ret == EOK, "Could not add first group"); - ret = sysdb_getgrnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, toname, &res); + ret = sysdb_getgrnam(test_ctx, test_ctx->domain, toname, &res); fail_unless(ret == EOK, "Could not retrieve the group from cache\n"); if (res->count != 1) { fail("Invalid number of replies. Expected 1, got %d", res->count); @@ -3529,8 +3516,7 @@ START_TEST(test_group_rename) name, toname); /* Verify the first name is gone */ - ret = sysdb_getgrnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, fromname, &res); + ret = sysdb_getgrnam(test_ctx, test_ctx->domain, fromname, &res); fail_unless(ret == EOK, "Could not retrieve the group from cache\n"); fail_unless(res->count == 0, "Unexpectedly found the original user\n"); @@ -3561,8 +3547,7 @@ START_TEST(test_user_rename) NULL, NULL, NULL, 0, 0); fail_unless(ret == EOK, "Could not add first user"); - ret = sysdb_getpwnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, fromname, &res); + ret = sysdb_getpwnam(test_ctx, test_ctx->domain, fromname, &res); fail_unless(ret == EOK, "Could not retrieve the user from cache\n"); if (res->count != 1) { fail("Invalid number of replies. Expected 1, got %d", res->count); @@ -3588,8 +3573,7 @@ START_TEST(test_user_rename) NULL, NULL, NULL, 0, 0); fail_unless(ret == EOK, "Could not add second user"); - ret = sysdb_getpwnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, toname, &res); + ret = sysdb_getpwnam(test_ctx, test_ctx->domain, toname, &res); fail_unless(ret == EOK, "Could not retrieve the user from cache\n"); if (res->count != 1) { fail("Invalid number of replies. Expected 1, got %d", res->count); @@ -3606,8 +3590,7 @@ START_TEST(test_user_rename) name, fromname); /* Verify the first name is gone */ - ret = sysdb_getpwnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, fromname, &res); + ret = sysdb_getpwnam(test_ctx, test_ctx->domain, fromname, &res); fail_unless(ret == EOK, "Could not retrieve the user from cache\n"); fail_unless(res->count == 0, "Unexpectedly found the original user\n"); @@ -3857,8 +3840,8 @@ START_TEST (test_sysdb_get_netgroup_attr) description = talloc_asprintf(test_ctx, "Sysdb Netgroup %d", _i); netgrname = talloc_asprintf(test_ctx, "testnetgr%d", _i); - ret = sysdb_get_netgroup_attr(test_ctx, test_ctx->sysdb, - test_ctx->domain, netgrname, attrs, &res); + ret = sysdb_get_netgroup_attr(test_ctx, test_ctx->domain, netgrname, + attrs, &res); fail_if(ret != EOK, "Could not get netgroup attributes"); fail_if(res->count != 1, @@ -3930,8 +3913,7 @@ START_TEST(test_odd_characters) ret, strerror(ret)); talloc_zfree(msg); - ret = sysdb_getgrnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, odd_groupname, &res); + ret = sysdb_getgrnam(test_ctx, test_ctx->domain, odd_groupname, &res); fail_unless(ret == EOK, "sysdb_getgrnam error [%d][%s]", ret, strerror(ret)); fail_unless(res->count == 1, "Received [%d] responses", @@ -3973,8 +3955,7 @@ START_TEST(test_odd_characters) fail_unless(ret == EOK, "sysdb_add_group_member error [%d][%s]", ret, strerror(ret)); - ret = sysdb_getpwnam(test_ctx, test_ctx->sysdb, - test_ctx->domain, odd_username, &res); + ret = sysdb_getpwnam(test_ctx, test_ctx->domain, odd_username, &res); fail_unless(ret == EOK, "sysdb_getpwnam error [%d][%s]", ret, strerror(ret)); fail_unless(res->count == 1, "Received [%d] responses", @@ -3986,8 +3967,8 @@ START_TEST(test_odd_characters) talloc_zfree(res); /* Attributes */ - ret = sysdb_get_user_attr(test_ctx, test_ctx->sysdb, test_ctx->domain, - odd_username, user_attrs, &res); + ret = sysdb_get_user_attr(test_ctx, test_ctx->domain, odd_username, + user_attrs, &res); fail_unless(ret == EOK, "sysdb_get_user_attr error [%d][%s]", ret, strerror(ret)); talloc_free(res); @@ -4014,15 +3995,14 @@ START_TEST(test_odd_characters) ret, strerror(ret)); /* Retrieve */ - ret = sysdb_getnetgr(test_ctx, test_ctx->sysdb, - test_ctx->domain, odd_netgroupname, &res); + ret = sysdb_getnetgr(test_ctx, test_ctx->domain, odd_netgroupname, &res); fail_unless(ret == EOK, "sysdb_getnetgr error [%d][%s]", ret, strerror(ret)); fail_unless(res->count == 1, "Received [%d] responses", res->count); talloc_zfree(res); - ret = sysdb_get_netgroup_attr(test_ctx, test_ctx->sysdb, test_ctx->domain, + ret = sysdb_get_netgroup_attr(test_ctx, test_ctx->domain, odd_netgroupname, netgr_attrs, &res); fail_unless(ret == EOK, "sysdb_get_netgroup_attr error [%d][%s]", ret, strerror(ret)); diff --git a/src/tools/sss_groupdel.c b/src/tools/sss_groupdel.c index 456b2b488..d13309d24 100644 --- a/src/tools/sss_groupdel.c +++ b/src/tools/sss_groupdel.c @@ -91,7 +91,7 @@ int main(int argc, const char **argv) goto fini; } - ret = sysdb_getgrnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx); + ret = sysdb_getgrnam_sync(tctx, tctx->octx->name, tctx->octx); if (ret != EOK) { /* Error message will be printed in the switch */ goto done; diff --git a/src/tools/sss_groupmod.c b/src/tools/sss_groupmod.c index 29113d3d6..10deea885 100644 --- a/src/tools/sss_groupmod.c +++ b/src/tools/sss_groupmod.c @@ -123,7 +123,7 @@ int main(int argc, const char **argv) goto fini; } /* check the username to be able to give sensible error message */ - ret = sysdb_getgrnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx); + ret = sysdb_getgrnam_sync(tctx, tctx->octx->name, tctx->octx); if (ret != EOK) { ERROR("Cannot find group in local domain, " "modifying groups is allowed only in local domain\n"); diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c index 78e027421..38a1bba8e 100644 --- a/src/tools/sss_seed.c +++ b/src/tools/sss_seed.c @@ -685,7 +685,7 @@ static int seed_domain_user_info(const char *name, } /* look for user in cache */ - ret = sysdb_getpwnam(tmp_ctx, sysdb, domain, name, &res); + ret = sysdb_getpwnam(tmp_ctx, domain, name, &res); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, ("Couldn't lookup user (%s) in the cache\n", name)); diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c index 25c976345..8cae996a2 100644 --- a/src/tools/sss_sync_ops.c +++ b/src/tools/sss_sync_ops.c @@ -571,7 +571,6 @@ int groupdel(TALLOC_CTX *mem_ctx, * getpwnam, getgrnam and friends */ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, const char *name, struct ops_ctx *out) { @@ -579,7 +578,7 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx, const char *str; int ret; - ret = sysdb_getpwnam(mem_ctx, sysdb, out->domain, name, &res); + ret = sysdb_getpwnam(mem_ctx, out->domain, name, &res); if (ret) { return ret; } @@ -644,7 +643,6 @@ int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx, } int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, const char *name, struct ops_ctx *out) { @@ -652,7 +650,7 @@ int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx, const char *str; int ret; - ret = sysdb_getgrnam(mem_ctx, sysdb, out->domain, name, &res); + ret = sysdb_getgrnam(mem_ctx, out->domain, name, &res); if (ret) { return ret; } diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h index 95722a0b6..c1b787487 100644 --- a/src/tools/sss_sync_ops.h +++ b/src/tools/sss_sync_ops.h @@ -92,12 +92,10 @@ int groupmod(TALLOC_CTX *mem_ctx, struct ops_ctx *data); int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, const char *name, struct ops_ctx *out); int sysdb_getgrnam_sync(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, const char *name, struct ops_ctx *out); diff --git a/src/tools/sss_useradd.c b/src/tools/sss_useradd.c index ef594aed4..a1eef8d64 100644 --- a/src/tools/sss_useradd.c +++ b/src/tools/sss_useradd.c @@ -214,7 +214,6 @@ int main(int argc, const char **argv) * sysdb did assign it automatically, do a lookup */ if (tctx->octx->uid == 0) { ret = sysdb_getpwnam_sync(tctx, - tctx->sysdb, tctx->octx->name, tctx->octx); if (ret != EOK) { diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c index d61a45711..9d6c088c5 100644 --- a/src/tools/sss_userdel.c +++ b/src/tools/sss_userdel.c @@ -220,7 +220,6 @@ int main(int argc, const char **argv) } ret = sysdb_getpwnam_sync(tctx, - tctx->sysdb, tctx->octx->name, tctx->octx); if (ret != EOK) { diff --git a/src/tools/sss_usermod.c b/src/tools/sss_usermod.c index fa2c27b04..09946e9ac 100644 --- a/src/tools/sss_usermod.c +++ b/src/tools/sss_usermod.c @@ -141,7 +141,7 @@ int main(int argc, const char **argv) goto fini; } /* check the username to be able to give sensible error message */ - ret = sysdb_getpwnam_sync(tctx, tctx->sysdb, tctx->octx->name, tctx->octx); + ret = sysdb_getpwnam_sync(tctx, tctx->octx->name, tctx->octx); if (ret != EOK) { ERROR("Cannot find user in local domain, " "modifying users is allowed only in local domain\n"); diff --git a/src/tools/tools_util.c b/src/tools/tools_util.c index 0e1b3b407..d31286dc4 100644 --- a/src/tools/tools_util.c +++ b/src/tools/tools_util.c @@ -223,7 +223,6 @@ int check_group_names(struct tools_ctx *tctx, ret = EOK; for (i=0; grouplist[i]; ++i) { ret = sysdb_getgrnam_sync(tctx, - tctx->sysdb, grouplist[i], groupinfo); if (ret) { |