From ac3a1f3da772cf101101c31675c63dc3549b21b5 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 31 Oct 2011 12:43:12 +0100 Subject: Cleanup: Remove unused parameters --- src/providers/ipa/ipa_access.c | 4 ---- src/providers/ipa/ipa_dyndns.c | 3 +-- src/providers/ipa/ipa_dyndns.h | 3 +-- src/providers/ipa/ipa_hbac_common.c | 8 +------- src/providers/ipa/ipa_hbac_hosts.c | 10 ++-------- src/providers/ipa/ipa_hbac_private.h | 8 -------- src/providers/ipa/ipa_hbac_rules.c | 2 -- src/providers/ipa/ipa_hbac_services.c | 4 ---- src/providers/ipa/ipa_hbac_users.c | 2 -- src/providers/ipa/ipa_init.c | 2 +- 10 files changed, 6 insertions(+), 40 deletions(-) (limited to 'src/providers/ipa') diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index 10f1cb7e6..f02f64ed8 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -296,7 +296,6 @@ static int hbac_get_host_info_step(struct hbac_ctx *hbac_ctx) ipa_hbac_host_info_send(hbac_ctx, hbac_ctx_ev(hbac_ctx), hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, sdap_id_op_handle(hbac_ctx->sdap_op), hbac_ctx_sdap_id_ctx(hbac_ctx)->opts, hbac_ctx->hbac_search_base); @@ -329,7 +328,6 @@ static void hbac_get_service_info_step(struct tevent_req *req) req = ipa_hbac_service_info_send(hbac_ctx, hbac_ctx_ev(hbac_ctx), hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, sdap_id_op_handle(hbac_ctx->sdap_op), hbac_ctx_sdap_id_ctx(hbac_ctx)->opts, hbac_ctx->hbac_search_base); @@ -395,8 +393,6 @@ static void hbac_get_rule_info_step(struct tevent_req *req) req = ipa_hbac_rule_info_send(hbac_ctx, hbac_ctx->get_deny_rules, hbac_ctx_ev(hbac_ctx), - hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, sdap_id_op_handle(hbac_ctx->sdap_op), hbac_ctx_sdap_id_ctx(hbac_ctx)->opts, hbac_ctx->hbac_search_base, diff --git a/src/providers/ipa/ipa_dyndns.c b/src/providers/ipa/ipa_dyndns.c index c532c3d0b..946fa3900 100644 --- a/src/providers/ipa/ipa_dyndns.c +++ b/src/providers/ipa/ipa_dyndns.c @@ -138,8 +138,7 @@ fail: } -errno_t ipa_dyndns_init(TALLOC_CTX *mem_ctx, - struct be_ctx *be_ctx, +errno_t ipa_dyndns_init(struct be_ctx *be_ctx, struct ipa_options *ctx) { errno_t ret; diff --git a/src/providers/ipa/ipa_dyndns.h b/src/providers/ipa/ipa_dyndns.h index 0d8ce7e7a..d86c6634b 100644 --- a/src/providers/ipa/ipa_dyndns.h +++ b/src/providers/ipa/ipa_dyndns.h @@ -25,8 +25,7 @@ #ifndef IPA_DYNDNS_H_ #define IPA_DYNDNS_H_ -errno_t ipa_dyndns_init(TALLOC_CTX *mem_ctx, - struct be_ctx *be_ctx, +errno_t ipa_dyndns_init(struct be_ctx *be_ctx, struct ipa_options *ctx); void ipa_dyndns_update(void *pvt); diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index 8815dae18..88532302d 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -299,7 +299,6 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the users */ ret = hbac_user_attrs_to_rule(new_rule, hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, new_rule->name, hbac_ctx->rules[idx], &new_rule->users); @@ -312,7 +311,6 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the services */ ret = hbac_service_attrs_to_rule(new_rule, hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, new_rule->name, hbac_ctx->rules[idx], &new_rule->services); @@ -325,7 +323,6 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the target hosts */ ret = hbac_thost_attrs_to_rule(new_rule, hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, new_rule->name, hbac_ctx->rules[idx], &new_rule->targethosts); @@ -338,7 +335,6 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the source hosts */ ret = hbac_shost_attrs_to_rule(new_rule, hbac_ctx_sysdb(hbac_ctx), - hbac_ctx_be(hbac_ctx)->domain, new_rule->name, hbac_ctx->rules[idx], &new_rule->srchosts); @@ -396,7 +392,6 @@ done: static errno_t hbac_eval_user_element(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *username, struct hbac_request_element **user_element); @@ -440,7 +435,7 @@ hbac_ctx_to_eval_request(TALLOC_CTX *mem_ctx, eval_req->request_time = time(NULL); /* Get user the user name and groups */ - ret = hbac_eval_user_element(eval_req, sysdb, domain, + ret = hbac_eval_user_element(eval_req, sysdb, pd->user, &eval_req->user); if (ret != EOK) goto done; @@ -489,7 +484,6 @@ done: static errno_t hbac_eval_user_element(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *username, struct hbac_request_element **user_element) { diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c index 42a3f5c1b..75cbcd7fb 100644 --- a/src/providers/ipa/ipa_hbac_hosts.c +++ b/src/providers/ipa/ipa_hbac_hosts.c @@ -28,7 +28,6 @@ struct ipa_hbac_host_state { struct tevent_context *ev; struct sysdb_ctx *sysdb; - struct sss_domain_info *dom; struct sdap_handle *sh; struct sdap_options *opts; const char *search_base; @@ -52,7 +51,6 @@ struct tevent_req * ipa_hbac_host_info_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base) @@ -70,7 +68,6 @@ ipa_hbac_host_info_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->sysdb = sysdb; - state->dom = dom; state->sh = sh; state->opts = opts; state->search_base = search_base; @@ -246,7 +243,6 @@ ipa_hbac_host_info_recv(struct tevent_req *req, */ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, const char *category_attr, @@ -441,14 +437,13 @@ done: errno_t hbac_thost_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **thosts) { DEBUG(7, ("Processing target hosts for rule [%s]\n", rule_name)); - return hbac_host_attrs_to_rule(mem_ctx, sysdb, domain, + return hbac_host_attrs_to_rule(mem_ctx, sysdb, rule_name, rule_attrs, IPA_HOST_CATEGORY, IPA_MEMBER_HOST, NULL, thosts); @@ -457,7 +452,6 @@ hbac_thost_attrs_to_rule(TALLOC_CTX *mem_ctx, errno_t hbac_shost_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **source_hosts) @@ -471,7 +465,7 @@ hbac_shost_attrs_to_rule(TALLOC_CTX *mem_ctx, DEBUG(7, ("Processing source hosts for rule [%s]\n", rule_name)); - ret = hbac_host_attrs_to_rule(tmp_ctx, sysdb, domain, + ret = hbac_host_attrs_to_rule(tmp_ctx, sysdb, rule_name, rule_attrs, IPA_SOURCE_HOST_CATEGORY, IPA_SOURCE_HOST, &host_count, &shosts); diff --git a/src/providers/ipa/ipa_hbac_private.h b/src/providers/ipa/ipa_hbac_private.h index 32b5d70ce..6b5956df0 100644 --- a/src/providers/ipa/ipa_hbac_private.h +++ b/src/providers/ipa/ipa_hbac_private.h @@ -103,7 +103,6 @@ struct tevent_req * ipa_hbac_host_info_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base); @@ -119,7 +118,6 @@ ipa_hbac_host_info_recv(struct tevent_req *req, errno_t hbac_thost_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **thosts); @@ -127,7 +125,6 @@ hbac_thost_attrs_to_rule(TALLOC_CTX *mem_ctx, errno_t hbac_shost_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **source_hosts); @@ -142,7 +139,6 @@ struct tevent_req * ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base); @@ -158,7 +154,6 @@ ipa_hbac_service_info_recv(struct tevent_req *req, errno_t hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **services); @@ -173,8 +168,6 @@ struct tevent_req * ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, bool get_deny_rules, struct tevent_context *ev, - struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base, @@ -190,7 +183,6 @@ ipa_hbac_rule_info_recv(struct tevent_req *req, errno_t hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **users); diff --git a/src/providers/ipa/ipa_hbac_rules.c b/src/providers/ipa/ipa_hbac_rules.c index cc502a8fb..0b567dab8 100644 --- a/src/providers/ipa/ipa_hbac_rules.c +++ b/src/providers/ipa/ipa_hbac_rules.c @@ -38,8 +38,6 @@ struct tevent_req * ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, bool get_deny_rules, struct tevent_context *ev, - struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base, diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c index dace7b235..cc4e6dea5 100644 --- a/src/providers/ipa/ipa_hbac_services.c +++ b/src/providers/ipa/ipa_hbac_services.c @@ -27,7 +27,6 @@ struct ipa_hbac_service_state { struct tevent_context *ev; struct sysdb_ctx *sysdb; - struct sss_domain_info *dom; struct sdap_handle *sh; struct sdap_options *opts; const char *search_base; @@ -50,7 +49,6 @@ struct tevent_req * ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct sysdb_ctx *sysdb, - struct sss_domain_info *dom, struct sdap_handle *sh, struct sdap_options *opts, const char *search_base) @@ -69,7 +67,6 @@ ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->sysdb = sysdb; - state->dom = dom; state->sh = sh; state->opts = opts; state->search_base = search_base; @@ -260,7 +257,6 @@ ipa_hbac_service_info_recv(struct tevent_req *req, errno_t hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **services) diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c index cf838e503..e25de6ad0 100644 --- a/src/providers/ipa/ipa_hbac_users.c +++ b/src/providers/ipa/ipa_hbac_users.c @@ -27,7 +27,6 @@ struct hbac_update_groups_state { struct hbac_ctx *hbac_ctx; struct sysdb_ctx *sysdb; - struct sss_domain_info *domain; }; @@ -150,7 +149,6 @@ done: errno_t hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, - struct sss_domain_info *domain, const char *rule_name, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **users) diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index 5d08b8c18..df22535d0 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -149,7 +149,7 @@ int sssm_ipa_id_init(struct be_ctx *bectx, /* nsupdate is available. Dynamic updates * are supported */ - ret = ipa_dyndns_init(ctx, ctx->be, ipa_options); + ret = ipa_dyndns_init(ctx->be, ipa_options); if (ret != EOK) { DEBUG(1, ("Failure setting up automatic DNS update\n")); /* We will continue without DNS updating */ -- cgit