SYSDB: Drop the sysdb_ctx parameter - module sysdb_ops (part 2)

4 files changed, 12 insertions, 14 deletions

diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index c6d2508ce..8a232b788 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -354,17 +354,17 @@ static bool invalidate_entries(TALLOC_CTX *ctx,
     switch (entry_type) {
     case TYPE_USER:
         type_string = "user";
-        ret = sysdb_search_users(ctx, sysdb, dinfo,
+        ret = sysdb_search_users(ctx, dinfo,
                                  filter, attrs, &msg_count, &msgs);
         break;
     case TYPE_GROUP:
         type_string = "group";
-        ret = sysdb_search_groups(ctx, sysdb, dinfo,
+        ret = sysdb_search_groups(ctx, dinfo,
                                   filter, attrs, &msg_count, &msgs);
         break;
     case TYPE_NETGROUP:
         type_string = "netgroup";
-        ret = sysdb_search_netgroups(ctx, sysdb, dinfo,
+        ret = sysdb_search_netgroups(ctx, dinfo,
                                      filter, attrs, &msg_count, &msgs);
         break;
     case TYPE_SERVICE:
@@ -435,8 +435,8 @@ static errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
                                                SYSDB_MOD_REP);
                     break;
                 case TYPE_NETGROUP:
-                    ret = sysdb_set_netgroup_attr(sysdb, domain, name,
-                            sys_attrs, SYSDB_MOD_REP);
+                    ret = sysdb_set_netgroup_attr(domain, name, sys_attrs,
+                                                  SYSDB_MOD_REP);
                     break;
                 case TYPE_SERVICE:
                     ret = sysdb_set_service_attr(domain, name,
@@ -701,7 +701,7 @@ search_autofsmaps(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
                   size_t *msgs_count, struct ldb_message ***msgs)
 {
 #ifdef BUILD_AUTOFS
-    return sysdb_search_custom(mem_ctx, sysdb, domain, sub_filter,
+    return sysdb_search_custom(mem_ctx, domain, sub_filter,
                                AUTOFS_MAP_SUBDIR, attrs,
                                msgs_count, msgs);
 #else
diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index d52f800c5..59b8eff59 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -437,7 +437,7 @@ static int group_show_trim_memberof(TALLOC_CTX *mem_ctx,
             return ENOMEM;
         }
 
-        ret = sysdb_search_groups(mem_ctx, sysdb, domain,
+        ret = sysdb_search_groups(mem_ctx, domain,
                                   filter, NULL, &count, &msgs);
         /* ENOENT is OK, the group is just not a direct parent */
         if (ret != EOK && ret != ENOENT) {
diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c
index 38a1bba8e..cb5a0bfc4 100644
--- a/src/tools/sss_seed.c
+++ b/src/tools/sss_seed.c
@@ -740,7 +740,7 @@ static int seed_cache_user(struct seed_ctx *sctx)
     in_transaction = true;
 
     if (sctx->user_cached == false) {
-        ret = sysdb_add_user(sctx->sysdb, sctx->domain, sctx->uctx->name,
+        ret = sysdb_add_user(sctx->domain, sctx->uctx->name,
                              sctx->uctx->uid, sctx->uctx->gid,
                              sctx->uctx->gecos, sctx->uctx->home,
                              sctx->uctx->shell, NULL, NULL, 0, 0);
@@ -753,7 +753,7 @@ static int seed_cache_user(struct seed_ctx *sctx)
         }
     }
 
-    ret = sysdb_cache_password(sctx->sysdb, sctx->domain, sctx->uctx->name,
+    ret = sysdb_cache_password(sctx->domain, sctx->uctx->name,
                                sctx->uctx->password);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE, ("Failed to cache password. (%d)[%s]\n",
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 1c93efcaf..c815de80e 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -77,7 +77,7 @@ static int mod_groups_member(struct sysdb_ctx *sysdb,
             goto done;
         }
 
-        ret = sysdb_mod_group_member(sysdb, member_dn, parent_dn, optype);
+        ret = sysdb_mod_group_member(dom, member_dn, parent_dn, optype);
         if (ret) {
             goto done;
         }
@@ -468,8 +468,7 @@ int useradd(TALLOC_CTX *mem_ctx,
 {
     int ret;
 
-    ret = sysdb_add_user(sysdb,
-                         data->domain, data->name, data->uid, data->gid,
+    ret = sysdb_add_user(data->domain, data->name, data->uid, data->gid,
                          data->gecos, data->home, data->shell,
                          NULL, NULL, 0, 0);
     if (ret) {
@@ -533,8 +532,7 @@ int groupadd(struct sysdb_ctx *sysdb,
 {
     int ret;
 
-    ret = sysdb_add_group(sysdb, data->domain,
-                          data->name, data->gid, NULL, 0, 0);
+    ret = sysdb_add_group(data->domain, data->name, data->gid, NULL, 0, 0);
     if (ret == EOK) {
         flush_nscd_cache(NSCD_DB_GROUP);
     }