diff options
author | Michal Zidek <mzidek@redhat.com> | 2013-11-05 18:36:57 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-11-15 20:20:19 +0100 |
commit | e2ac9be4f293b96f3c8992f1171e44bc1da5cfca (patch) | |
tree | e6cd887945e5ea9b47201d8c733571e3bdbe36e3 /src/providers | |
parent | d115f40c7a3999e3cbe705a2ff9cf0fd493f80fb (diff) | |
download | sssd-e2ac9be4f293b96f3c8992f1171e44bc1da5cfca.tar.gz sssd-e2ac9be4f293b96f3c8992f1171e44bc1da5cfca.tar.xz sssd-e2ac9be4f293b96f3c8992f1171e44bc1da5cfca.zip |
SYSDB: Drop redundant sysdb_ctx parameter from sysdb.c
Diffstat (limited to 'src/providers')
-rw-r--r-- | src/providers/ad/ad_id.c | 3 | ||||
-rw-r--r-- | src/providers/dp_refresh.c | 2 | ||||
-rw-r--r-- | src/providers/ipa/ipa_access.c | 3 | ||||
-rw-r--r-- | src/providers/ipa/ipa_hbac_common.c | 9 | ||||
-rw-r--r-- | src/providers/ipa/ipa_selinux.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/ldap_id_enum.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_enum.c | 3 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_groups.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_initgroups.c | 3 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_initgroups_ad.c | 3 | ||||
-rw-r--r-- | src/providers/ldap/sdap_async_netgroups.c | 2 | ||||
-rw-r--r-- | src/providers/ldap/sdap_reinit.c | 2 |
12 files changed, 14 insertions, 22 deletions
diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c index 736f9bb18..242e962fb 100644 --- a/src/providers/ad/ad_id.c +++ b/src/providers/ad/ad_id.c @@ -585,8 +585,7 @@ ad_enumeration_done(struct tevent_req *subreq) * process on the next SSSD service restart (to avoid * slowing down system boot-up */ - ret = sysdb_set_enumerated(state->sdom->dom->sysdb, - state->sdom->dom, true); + ret = sysdb_set_enumerated(state->sdom->dom, true); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having enumerated.\n")); diff --git a/src/providers/dp_refresh.c b/src/providers/dp_refresh.c index c368668e1..f81ff1a7f 100644 --- a/src/providers/dp_refresh.c +++ b/src/providers/dp_refresh.c @@ -97,7 +97,7 @@ static errno_t be_refresh_get_netgroups(TALLOC_CTX *mem_ctx, struct ldb_dn *base_dn = NULL; errno_t ret; - base_dn = sysdb_netgroup_base_dn(domain->sysdb, mem_ctx, domain); + base_dn = sysdb_netgroup_base_dn(mem_ctx, domain); if (base_dn == NULL) { return ENOMEM; } diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index d1574e642..c601935a6 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -513,8 +513,7 @@ static void hbac_sysdb_save(struct tevent_req *req) /* Delete any rules in the sysdb so offline logins * are also denied. */ - base_dn = sysdb_custom_subtree_dn(domain->sysdb, tmp_ctx, - domain, HBAC_RULES_SUBDIR); + base_dn = sysdb_custom_subtree_dn(tmp_ctx, domain, HBAC_RULES_SUBDIR); if (base_dn == NULL) { talloc_free(tmp_ctx); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index a37db7554..09bfc5eb0 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -44,8 +44,7 @@ ipa_hbac_save_list(struct sss_domain_info *domain, } if (delete_subdir) { - base_dn = sysdb_custom_subtree_dn(domain->sysdb, tmp_ctx, - domain, subdir); + base_dn = sysdb_custom_subtree_dn(tmp_ctx, domain, subdir); if (base_dn == NULL) { ret = ENOMEM; goto done; @@ -623,8 +622,7 @@ hbac_eval_service_element(TALLOC_CTX *mem_ctx, svc->name = servicename; - svc_dn = sysdb_custom_dn(sysdb, tmp_ctx, - domain, svc->name, HBAC_SERVICES_SUBDIR); + svc_dn = sysdb_custom_dn(tmp_ctx, domain, svc->name, HBAC_SERVICES_SUBDIR); if (svc_dn == NULL) { ret = ENOMEM; goto done; @@ -731,8 +729,7 @@ hbac_eval_host_element(TALLOC_CTX *mem_ctx, goto done; } - host_dn = sysdb_custom_dn(sysdb, tmp_ctx, - domain, host->name, HBAC_HOSTS_SUBDIR); + host_dn = sysdb_custom_dn(tmp_ctx, domain, host->name, HBAC_HOSTS_SUBDIR); if (host_dn == NULL) { ret = ENOMEM; goto done; diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index d6bb41c45..c77c8f5a5 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -228,7 +228,7 @@ ipa_selinux_create_op_ctx(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, goto fail; } - host_dn = sysdb_custom_dn(sysdb, op_ctx, domain, hostname, HBAC_HOSTS_SUBDIR); + host_dn = sysdb_custom_dn(op_ctx, domain, hostname, HBAC_HOSTS_SUBDIR); if (host_dn == NULL) { goto fail; } diff --git a/src/providers/ldap/ldap_id_enum.c b/src/providers/ldap/ldap_id_enum.c index 8cccaa916..58ff459c0 100644 --- a/src/providers/ldap/ldap_id_enum.c +++ b/src/providers/ldap/ldap_id_enum.c @@ -39,7 +39,7 @@ errno_t ldap_setup_enumeration(struct sdap_id_ctx *ctx, bool has_enumerated; struct ldap_enum_ctx *ectx; - ret = sysdb_has_enumerated(sdom->dom->sysdb, sdom->dom, &has_enumerated); + ret = sysdb_has_enumerated(sdom->dom, &has_enumerated); if (ret != EOK) { return ret; } diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c index a1bc0977c..a006d1e11 100644 --- a/src/providers/ldap/sdap_async_enum.c +++ b/src/providers/ldap/sdap_async_enum.c @@ -303,8 +303,7 @@ static void sdap_dom_enum_services_done(struct tevent_req *subreq) * process on the next SSSD service restart (to avoid * slowing down system boot-up */ - ret = sysdb_set_enumerated(state->sdom->dom->sysdb, - state->sdom->dom, true); + ret = sysdb_set_enumerated(state->sdom->dom, true); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having enumerated.\n")); diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index a943663ec..ff4f1bbc1 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -61,7 +61,7 @@ static int sdap_find_entry_by_origDN(TALLOC_CTX *memctx, goto done; } - base_dn = sysdb_domain_dn(ctx, tmpctx, domain); + base_dn = sysdb_domain_dn(tmpctx, domain); if (!base_dn) { ret = ENOMEM; goto done; diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index e869ea016..22df38148 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -2814,8 +2814,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) } in_transaction = false; - ret = sysdb_get_real_name(state, state->sysdb, - state->dom, state->name, &cname); + ret = sysdb_get_real_name(state, state->dom, state->name, &cname); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("Cannot canonicalize username\n")); tevent_req_error(req, ret); diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index 7824f0b98..e533f07b5 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -521,8 +521,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq) goto done; } - group_ldb_dn = sysdb_group_dn(group_domain->sysdb, tmp_ctx, - group_domain, group_name); + group_ldb_dn = sysdb_group_dn(tmp_ctx, group_domain, group_name); if (group_ldb_dn == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, ("sysdb_group_dn() failed\n")); ret = ENOMEM; diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c index 19bcc3f48..710e6c78a 100644 --- a/src/providers/ldap/sdap_async_netgroups.c +++ b/src/providers/ldap/sdap_async_netgroups.c @@ -324,7 +324,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, goto fail; } - netgr_basedn = sysdb_netgroup_base_dn(sysdb, state, dom); + netgr_basedn = sysdb_netgroup_base_dn(state, dom); if (netgr_basedn == NULL) { ret = ENOMEM; goto fail; diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c index 51da8128d..5c909379d 100644 --- a/src/providers/ldap/sdap_reinit.c +++ b/src/providers/ldap/sdap_reinit.c @@ -216,7 +216,7 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) * process on the next SSSD service restart (to avoid * slowing down system boot-up */ - ret = sysdb_set_enumerated(state->sysdb, state->domain, true); + ret = sysdb_set_enumerated(state->domain, true); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having " "enumerated.\n")); |