From 0700185377ad23885cc2ddae20abe0dc36a3abca Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 9 Jan 2013 17:29:24 -0500 Subject: Remove sysdb arg from hbac_service_attrs_to_rule() --- src/providers/ipa/ipa_hbac_common.c | 1 - src/providers/ipa/ipa_hbac_private.h | 1 - src/providers/ipa/ipa_hbac_services.c | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/providers') diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index b9ec83f0..652220b2 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -325,7 +325,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_req->domain, new_rule->name, hbac_ctx->rules[idx], diff --git a/src/providers/ipa/ipa_hbac_private.h b/src/providers/ipa/ipa_hbac_private.h index 6aefddff..85716059 100644 --- a/src/providers/ipa/ipa_hbac_private.h +++ b/src/providers/ipa/ipa_hbac_private.h @@ -132,7 +132,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, diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c index 8f656985..72e6f1b6 100644 --- a/src/providers/ipa/ipa_hbac_services.c +++ b/src/providers/ipa/ipa_hbac_services.c @@ -383,7 +383,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, @@ -469,7 +468,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, } /* First check if this is a specific service */ - ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, HBAC_SERVICES_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; @@ -504,7 +503,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, num_services++; } else { /* ret == ENOENT */ /* Check if this is a service group */ - ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter, + ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter, HBAC_SERVICEGROUPS_SUBDIR, attrs, &count, &msgs); if (ret != EOK && ret != ENOENT) goto done; -- cgit