From 99c0cfdc5f065ba38f1ee91701d1d27f9e4fdb96 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Mon, 7 Jan 2013 20:10:42 -0500
Subject: Add domain argument to sysdb_store_group()

Also remove sysdb_store_domgroup()
---
 src/providers/ipa/ipa_s2n_exop.c       | 5 ++---
 src/providers/ldap/sdap_async_groups.c | 8 +++++---
 src/providers/proxy/proxy_id.c         | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/providers')

diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c
index 347a0606..0b4842cc 100644
--- a/src/providers/ipa/ipa_s2n_exop.c
+++ b/src/providers/ipa/ipa_s2n_exop.c
@@ -699,9 +699,8 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq)
                 goto done;
             }
 
-            ret = sysdb_store_domgroup(state->dom, name,
-                                       attrs->a.group.gr_gid, NULL, timeout,
-                                       now);
+            ret = sysdb_store_group(state->dom->sysdb, state->dom, name,
+                                    attrs->a.group.gr_gid, NULL, timeout, now);
             break;
         default:
             DEBUG(SSSDBG_OP_FAILURE, ("Unexpected response type [%d].\n",
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index cdb60819..4fdacae6 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -260,6 +260,7 @@ done:
 
 static errno_t
 sdap_store_group_with_gid(struct sysdb_ctx *ctx,
+                          struct sss_domain_info *domain,
                           const char *name,
                           gid_t gid,
                           struct sysdb_attrs *group_attrs,
@@ -279,7 +280,8 @@ sdap_store_group_with_gid(struct sysdb_ctx *ctx,
         }
     }
 
-    ret = sysdb_store_group(ctx, name, gid, group_attrs, cache_timeout, now);
+    ret = sysdb_store_group(ctx, domain, name, gid,
+                            group_attrs, cache_timeout, now);
     if (ret) {
         DEBUG(2, ("Could not store group %s\n", name));
         return ret;
@@ -597,7 +599,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
 
     DEBUG(6, ("Storing info for group %s\n", name));
 
-    ret = sdap_store_group_with_gid(ctx,
+    ret = sdap_store_group_with_gid(ctx, dom,
                                     name, gid, group_attrs,
                                     dom->group_timeout,
                                     posix_group, now);
@@ -692,7 +694,7 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx,
 
     DEBUG(6, ("Storing members for group %s\n", name));
 
-    ret = sysdb_store_group(ctx, name, 0, group_attrs,
+    ret = sysdb_store_group(ctx, dom, name, 0, group_attrs,
                             dom->group_timeout, now);
     if (ret) goto fail;
 
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 76fbad45..25637783 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -611,7 +611,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom,
         }
     }
 
-    ret = sysdb_store_group(sysdb,
+    ret = sysdb_store_group(sysdb, dom,
                             real_name,
                             grp->gr_gid,
                             attrs,
-- 
cgit