summaryrefslogtreecommitdiffstats
path: root/src/providers
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2013-01-09 17:06:08 -0500
committerJakub Hrozek <jhrozek@redhat.com>2013-01-21 22:17:33 +0100
commit8a81628d58dd2991d53398a213916671e14592d8 (patch)
treec3383f9b2247e10a478ea89cebe77212787e997d /src/providers
parent16ba62a78cd55d63a58be0b0d55b7b920a2a9853 (diff)
downloadsssd-8a81628d58dd2991d53398a213916671e14592d8.tar.gz
sssd-8a81628d58dd2991d53398a213916671e14592d8.tar.xz
sssd-8a81628d58dd2991d53398a213916671e14592d8.zip
Remove sysdb argument from hbac_user_attrs_to_rule()
Diffstat (limited to 'src/providers')
-rw-r--r--src/providers/ipa/ipa_hbac_common.c1
-rw-r--r--src/providers/ipa/ipa_hbac_private.h1
-rw-r--r--src/providers/ipa/ipa_hbac_users.c8
3 files changed, 4 insertions, 6 deletions
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
index 5cc96c4bb..b9ec83f04 100644
--- a/src/providers/ipa/ipa_hbac_common.c
+++ b/src/providers/ipa/ipa_hbac_common.c
@@ -313,7 +313,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_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 b0a3dd633..6aefddff2 100644
--- a/src/providers/ipa/ipa_hbac_private.h
+++ b/src/providers/ipa/ipa_hbac_private.h
@@ -146,7 +146,6 @@ get_ipa_servicegroupname(TALLOC_CTX *mem_ctx,
/* From ipa_hbac_users.c */
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,
diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c
index 727d57ede..a5fcaad4e 100644
--- a/src/providers/ipa/ipa_hbac_users.c
+++ b/src/providers/ipa/ipa_hbac_users.c
@@ -142,7 +142,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,
@@ -226,7 +225,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx,
}
/* First check if this is a user */
- ret = sysdb_search_users(tmp_ctx, sysdb, domain,
+ ret = sysdb_search_users(tmp_ctx, domain->sysdb, domain,
filter, attrs, &count, &msgs);
if (ret != EOK && ret != ENOENT) goto done;
if (ret == EOK && count == 0) {
@@ -259,7 +258,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx,
num_users++;
} else {
/* Check if it is a group instead */
- ret = sysdb_search_groups(tmp_ctx, sysdb, domain,
+ ret = sysdb_search_groups(tmp_ctx, domain->sysdb, domain,
filter, attrs, &count, &msgs);
if (ret != EOK && ret != ENOENT) goto done;
if (ret == EOK && count == 0) {
@@ -295,7 +294,8 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx,
/* If the group still matches the group pattern,
* we can assume it is a non-POSIX group.
*/
- ret = get_ipa_groupname(new_users->groups, sysdb, member_user,
+ ret = get_ipa_groupname(new_users->groups, domain->sysdb,
+ member_user,
&new_users->groups[num_groups]);
if (ret == EOK) {
DEBUG(8, ("Added non-POSIX group [%s] to rule [%s]\n",