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

9 files changed, 17 insertions, 19 deletions

diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index f067b7021..d1574e642 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -704,7 +704,7 @@ errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
+    ret = sysdb_search_custom(tmp_ctx, domain, filter,
                               HBAC_RULES_SUBDIR, attrs,
                               &rule_count, &msgs);
     if (ret != EOK && ret != ENOENT) {
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
index e539b29d2..a37db7554 100644
--- a/src/providers/ipa/ipa_hbac_common.c
+++ b/src/providers/ipa/ipa_hbac_common.c
@@ -78,8 +78,7 @@ ipa_hbac_save_list(struct sss_domain_info *domain,
         }
         DEBUG(9, ("Object name: [%s].\n", object_name));
 
-        ret = sysdb_store_custom(domain->sysdb, domain,
-                                 object_name, subdir, list[c]);
+        ret = sysdb_store_custom(domain, object_name, subdir, list[c]);
         if (ret != EOK) {
             DEBUG(1, ("sysdb_store_custom failed.\n"));
             goto done;
diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c
index e85206e8f..dbc02b865 100644
--- a/src/providers/ipa/ipa_hbac_hosts.c
+++ b/src/providers/ipa/ipa_hbac_hosts.c
@@ -114,7 +114,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx,
         }
 
         /* First check if this is a specific host */
-        ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
+        ret = sysdb_search_custom(tmp_ctx, domain, filter,
                                   HBAC_HOSTS_SUBDIR, attrs,
                                   &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
@@ -150,7 +150,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx,
             num_hosts++;
         } else { /* ret == ENOENT */
             /* Check if this is a hostgroup */
-            ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
+            ret = sysdb_search_custom(tmp_ctx, domain, filter,
                                       HBAC_HOSTGROUPS_SUBDIR, attrs,
                                       &count, &msgs);
             if (ret != EOK && ret != ENOENT) goto done;
diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c
index ace01fae2..b1cc524da 100644
--- a/src/providers/ipa/ipa_hbac_services.c
+++ b/src/providers/ipa/ipa_hbac_services.c
@@ -465,7 +465,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx,
         }
 
         /* First check if this is a specific service */
-        ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
+        ret = sysdb_search_custom(tmp_ctx, domain, filter,
                                   HBAC_SERVICES_SUBDIR, attrs,
                                   &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
@@ -500,7 +500,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx,
             num_services++;
         } else { /* ret == ENOENT */
             /* Check if this is a service group */
-            ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
+            ret = sysdb_search_custom(tmp_ctx, domain, filter,
                                       HBAC_SERVICEGROUPS_SUBDIR, attrs,
                                       &count, &msgs);
             if (ret != EOK && ret != ENOENT) goto done;
diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c
index a5fcaad4e..cd56e1913 100644
--- a/src/providers/ipa/ipa_hbac_users.c
+++ b/src/providers/ipa/ipa_hbac_users.c
@@ -225,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, domain->sysdb, domain,
+        ret = sysdb_search_users(tmp_ctx, domain,
                                  filter, attrs, &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
         if (ret == EOK && count == 0) {
@@ -258,8 +258,8 @@ 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, domain->sysdb, domain,
-                                      filter, attrs, &count, &msgs);
+            ret = sysdb_search_groups(tmp_ctx, domain, filter, attrs,
+                                      &count, &msgs);
             if (ret != EOK && ret != ENOENT) goto done;
             if (ret == EOK && count == 0) {
                 ret = ENOENT;
diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c
index 6e0964400..56b8c9f05 100644
--- a/src/providers/ipa/ipa_id.c
+++ b/src/providers/ipa/ipa_id.c
@@ -309,7 +309,7 @@ static void ipa_id_get_netgroup_done(struct tevent_req *subreq)
     }
 
     if (ret == ENOENT) {
-        ret = sysdb_delete_netgroup(state->sysdb, state->domain, state->name);
+        ret = sysdb_delete_netgroup(state->domain, state->name);
         if (ret != EOK && ret != ENOENT) {
             tevent_req_error(req, ret);
             return;
diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c
index 0deb3944e..245930b10 100644
--- a/src/providers/ipa/ipa_netgroups.c
+++ b/src/providers/ipa/ipa_netgroups.c
@@ -171,7 +171,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx,
 
     DEBUG(6, ("Storing info for netgroup %s\n", name));
 
-    ret = sysdb_add_netgroup(ctx, dom, name, NULL, netgroup_attrs, NULL,
+    ret = sysdb_add_netgroup(dom, name, NULL, netgroup_attrs, NULL,
                              dom->netgroup_timeout, 0);
     if (ret) goto fail;
 
diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c
index e7dbeb459..7379b99e5 100644
--- a/src/providers/ipa/ipa_s2n_exop.c
+++ b/src/providers/ipa/ipa_s2n_exop.c
@@ -830,7 +830,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq)
                 gid = attrs->a.user.pw_gid;
             }
 
-            ret = sysdb_store_user(state->dom->sysdb, state->dom, name, NULL,
+            ret = sysdb_store_user(state->dom, name, NULL,
                                    attrs->a.user.pw_uid,
                                    gid, NULL, /* gecos */
                                    homedir, NULL, NULL, user_attrs, NULL,
@@ -886,9 +886,8 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq)
                 }
             }
 
-            ret = sysdb_store_group(state->dom->sysdb, state->dom, name,
-                                    attrs->a.group.gr_gid, group_attrs,
-                                    timeout, now);
+            ret = sysdb_store_group(state->dom, name, attrs->a.group.gr_gid,
+                                    group_attrs, timeout, now);
             break;
         default:
             DEBUG(SSSDBG_OP_FAILURE, ("Unexpected response type [%d].\n",
diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c
index 24f691bdf..7a65c1181 100644
--- a/src/providers/ipa/ipa_subdomains_ext_groups.c
+++ b/src/providers/ipa/ipa_subdomains_ext_groups.c
@@ -340,8 +340,8 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn,
             goto done;
         }
 
-        ret = sysdb_search_groups(tmp_ctx, group_dom->sysdb, group_dom,
-                                  subfilter, NULL, &msgs_count, &msgs);
+        ret = sysdb_search_groups(tmp_ctx, group_dom, subfilter, NULL,
+                                  &msgs_count, &msgs);
         if (ret != EOK) {
             if (ret == ENOENT) {
                 DEBUG(SSSDBG_TRACE_ALL, ("Group [%s] not in the cache.\n",
@@ -357,7 +357,7 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn,
 /* TODO? Do we have to remove members as well? I think not because the AD
  * query before removes all memberships. */
 
-        ret = sysdb_mod_group_member(group_dom->sysdb, user_dn, msgs[0]->dn,
+        ret = sysdb_mod_group_member(group_dom, user_dn, msgs[0]->dn,
                                      LDB_FLAG_MOD_ADD);
         if (ret != EOK && ret != EEXIST) {
             DEBUG(SSSDBG_OP_FAILURE, ("sysdb_mod_group_member failed.\n"));