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

4 files changed, 10 insertions, 11 deletions

diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 1934e4f0f..e93400db1 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -921,8 +921,8 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq)
         goto done;
     }
 
-    tret = sysdb_set_user_attr(state->domain->sysdb, state->domain,
-                               state->username, attrs, SYSDB_MOD_REP);
+    tret = sysdb_set_user_attr(state->domain, state->username, attrs,
+                               SYSDB_MOD_REP);
     if (tret != EOK) {
         /* Failing to save to the cache is non-fatal.
          * Just return the result.
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index 7a8f3e2a5..1f008e20f 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -1315,8 +1315,8 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state,
         /* We need to skip over zero-length usernames */
         if (member_name[0] == '\0') continue;
 
-        ret = sysdb_search_user_by_name(state, state->sysdb, state->dom,
-                                        member_name, NULL, &msg);
+        ret = sysdb_search_user_by_name(state, state->dom, member_name,
+                                        NULL, &msg);
         if (ret == EOK) {
             /*
              * User already cached in sysdb. Remember the sysdb DN for later
@@ -2140,8 +2140,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx,
 
             ret = sysdb_attrs_add_string(attrs, SYSDB_NAME, username);
             if (ret) goto done;
-            ret = sysdb_set_user_attr(user_dom->sysdb, user_dom, sysdb_name,
-                                      attrs, SYSDB_MOD_REP);
+            ret = sysdb_set_user_attr(user_dom, sysdb_name, attrs, SYSDB_MOD_REP);
             if (ret != EOK) goto done;
         } else {
             key.type = HASH_KEY_STRING;
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index fa69097fa..a3c879f2f 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -74,8 +74,8 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb,
             goto done;
         }
 
-        ret = sysdb_search_group_by_name(tmp_ctx, sysdb, domain,
-                                         tmp_name, NULL, &msg);
+        ret = sysdb_search_group_by_name(tmp_ctx, domain, tmp_name, NULL,
+                                         &msg);
         if (ret == EOK) {
             continue;
         } else if (ret == ENOENT) {
@@ -3109,7 +3109,7 @@ static errno_t get_sysdb_grouplist_ex(TALLOC_CTX *mem_ctx,
     tmp_ctx = talloc_new(NULL);
     if (!tmp_ctx) return ENOMEM;
 
-    ret = sysdb_search_user_by_name(tmp_ctx, sysdb, domain, name,
+    ret = sysdb_search_user_by_name(tmp_ctx, domain, name,
                                     attrs, &msg);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c
index e58d93fb2..d23cbd7cd 100644
--- a/src/providers/ldap/sdap_async_initgroups_ad.c
+++ b/src/providers/ldap/sdap_async_initgroups_ad.c
@@ -486,8 +486,8 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq)
               ("Processing membership GID [%"SPRIgid"]\n", gid));
 
         /* Check whether this GID already exists in the sysdb */
-        ret = sysdb_search_group_by_gid(tmp_ctx, group_domain->sysdb,
-                                        group_domain, gid, attrs, &msg);
+        ret = sysdb_search_group_by_gid(tmp_ctx, group_domain, gid, attrs,
+                                        &msg);
         if (ret == EOK) {
             group_name = ldb_msg_find_attr_as_string(msg, SYSDB_NAME, NULL);
             if (!group_name) {