From 9675bccabff4e79d224f64611ad9ff3e073b488e Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sun, 6 Jan 2013 02:04:58 -0500 Subject: Make sysdb_custom_subtree_dn() require a domain. --- src/providers/ipa/ipa_access.c | 2 +- src/providers/ipa/ipa_hbac_common.c | 2 +- src/providers/ldap/sdap_async_sudo.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/providers') diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index 3a34864c4..47bd91e7d 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -491,7 +491,7 @@ static void hbac_sysdb_save(struct tevent_req *req) * are also denied. */ base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx, - HBAC_RULES_SUBDIR); + 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 500f3548f..73789bd1e 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -44,7 +44,7 @@ ipa_hbac_save_list(struct sysdb_ctx *sysdb, bool delete_subdir, } if (delete_subdir) { - base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx, subdir); + base_dn = sysdb_custom_subtree_dn(sysdb, tmp_ctx, domain, subdir); if (base_dn == NULL) { ret = ENOMEM; goto done; diff --git a/src/providers/ldap/sdap_async_sudo.c b/src/providers/ldap/sdap_async_sudo.c index 89e28d894..974d3b174 100644 --- a/src/providers/ldap/sdap_async_sudo.c +++ b/src/providers/ldap/sdap_async_sudo.c @@ -87,6 +87,7 @@ static int sdap_sudo_load_sudoers_recv(struct tevent_req *req, static void sdap_sudo_refresh_load_done(struct tevent_req *subreq); static int sdap_sudo_purge_sudoers(struct sysdb_ctx *sysdb_ctx, + struct sss_domain_info *dom, const char *filter, struct sdap_attr_map *map, size_t rules_count, @@ -486,7 +487,7 @@ static void sdap_sudo_refresh_load_done(struct tevent_req *subreq) in_transaction = true; /* purge cache */ - ret = sdap_sudo_purge_sudoers(state->sysdb, state->sysdb_filter, + ret = sdap_sudo_purge_sudoers(state->sysdb, state->domain, state->sysdb_filter, state->opts->sudorule_map, rules_count, rules); if (ret != EOK) { goto done; @@ -533,6 +534,7 @@ done: } static int sdap_sudo_purge_sudoers(struct sysdb_ctx *sysdb_ctx, + struct sss_domain_info *dom, const char *filter, struct sdap_attr_map *map, size_t rules_count, @@ -570,7 +572,7 @@ static int sdap_sudo_purge_sudoers(struct sysdb_ctx *sysdb_ctx, ret = EOK; } else { /* purge cache by provided filter */ - ret = sysdb_sudo_purge_byfilter(sysdb_ctx, filter); + ret = sysdb_sudo_purge_byfilter(sysdb_ctx, dom, filter); if (ret != EOK) { goto done; } -- cgit