From 99c0cfdc5f065ba38f1ee91701d1d27f9e4fdb96 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 7 Jan 2013 20:10:42 -0500 Subject: Add domain argument to sysdb_store_group() Also remove sysdb_store_domgroup() --- src/db/sysdb_ops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/db/sysdb_ops.c') diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 61a0e77d..6d0d5acf 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1779,6 +1779,7 @@ fail: /* this function does not check that all user members are actually present */ int sysdb_store_group(struct sysdb_ctx *sysdb, + struct sss_domain_info *domain, const char *name, gid_t gid, struct sysdb_attrs *attrs, @@ -1797,7 +1798,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb, return ENOMEM; } - ret = sysdb_search_group_by_name(tmp_ctx, sysdb, sysdb->domain, + ret = sysdb_search_group_by_name(tmp_ctx, sysdb, domain, name, src_attrs, &msg); if (ret && ret != ENOENT) { goto done; @@ -1824,7 +1825,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb, if (new_group) { /* group doesn't exist, turn into adding a group */ - ret = sysdb_add_group(sysdb, sysdb->domain, name, gid, + ret = sysdb_add_group(sysdb, domain, name, gid, attrs, cache_timeout, now); if (ret == EEXIST) { /* This may be a group rename. If there is a group with the @@ -1842,7 +1843,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb, DEBUG(SSSDBG_MINOR_FAILURE, ("A group with the same GID [%llu] was removed from the " "cache\n", (unsigned long long) gid)); - ret = sysdb_add_group(sysdb, sysdb->domain, name, gid, + ret = sysdb_add_group(sysdb, domain, name, gid, attrs, cache_timeout, now); } goto done; @@ -1862,7 +1863,7 @@ int sysdb_store_group(struct sysdb_ctx *sysdb, (now + cache_timeout) : 0)); if (ret) goto done; - ret = sysdb_set_group_attr(sysdb, sysdb->domain, name, attrs, SYSDB_MOD_REP); + ret = sysdb_set_group_attr(sysdb, domain, name, attrs, SYSDB_MOD_REP); done: if (ret) { -- cgit