SYSDB: Drop the sysdb_ctx parameter from the sysdb_search module

9 files changed, 17 insertions, 23 deletions

diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index d0d47f49a..d59186d3e 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -905,8 +905,8 @@ static errno_t be_initgroups_prereq(struct be_req *be_req)
     const char *tmpstr;
     int i;
 
-    ret = sysdb_initgroups(be_req, be_req->be_ctx->domain->sysdb,
-                           be_req->be_ctx->domain, ar->filter_value, &res);
+    ret = sysdb_initgroups(be_req, be_req->be_ctx->domain, ar->filter_value,
+                           &res);
     if (ret && ret != ENOENT) {
         return ret;
     }
diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c
index 7df3dbbb2..24f691bdf 100644
--- a/src/providers/ipa/ipa_subdomains_ext_groups.c
+++ b/src/providers/ipa/ipa_subdomains_ext_groups.c
@@ -196,8 +196,7 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    ret = sysdb_initgroups(tmp_ctx, user_dom->sysdb, user_dom, user_name,
-                           &result);
+    ret = sysdb_initgroups(tmp_ctx, user_dom, user_name, &result);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE, ("sysdb_initgroups failed.\n"));
         goto done;
diff --git a/src/providers/krb5/krb5_access.c b/src/providers/krb5/krb5_access.c
index 479d01517..553635c34 100644
--- a/src/providers/krb5/krb5_access.c
+++ b/src/providers/krb5/krb5_access.c
@@ -89,8 +89,8 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx,
     attrs[3] = SYSDB_CANONICAL_UPN;
     attrs[4] = NULL;
 
-    ret = sysdb_get_user_attr(state, be_ctx->domain->sysdb, be_ctx->domain,
-                              state->pd->user, attrs, &res);
+    ret = sysdb_get_user_attr(state, be_ctx->domain, state->pd->user, attrs,
+                              &res);
     if (ret) {
         DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user));
         goto done;
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index ce461f5ad..f5a6a2c81 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -532,8 +532,8 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx,
     }
     kr = state->kr;
 
-    ret = sysdb_get_user_attr(state, state->sysdb, state->domain,
-                              state->pd->user, attrs, &res);
+    ret = sysdb_get_user_attr(state, state->domain, state->pd->user, attrs,
+                              &res);
     if (ret) {
         DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user));
         state->pam_status = PAM_SYSTEM_ERR;
diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c
index cf6d72ad2..47c2dd5b8 100644
--- a/src/providers/krb5/krb5_utils.c
+++ b/src/providers/krb5/krb5_utils.c
@@ -100,7 +100,7 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb,
         return ENOMEM;
     }
 
-    ret = sysdb_get_user_attr(tmp_ctx, sysdb, domain, user, attrs, &res);
+    ret = sysdb_get_user_attr(tmp_ctx, domain, user, attrs, &res);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_user_attr failed.\n"));
         goto done;
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index f9bab4b2b..b88f7db33 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -384,7 +384,7 @@ static int get_user_dn(TALLOC_CTX *memctx,
     attrs[9] = SYSDB_PWD_ATTRIBUTE;
     attrs[10] = NULL;
 
-    ret = sysdb_get_user_attr(tmpctx, sysdb, domain, username, attrs, &res);
+    ret = sysdb_get_user_attr(tmpctx, domain, username, attrs, &res);
     if (ret) {
         goto done;
     }
diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c
index 6b387271a..1934e4f0f 100644
--- a/src/providers/ldap/sdap_access.c
+++ b/src/providers/ldap/sdap_access.c
@@ -112,8 +112,7 @@ sdap_access_send(TALLOC_CTX *mem_ctx,
     }
 
     /* Get original user DN, domain already points to the right (sub)domain */
-    ret = sysdb_get_user_attr(state, domain->sysdb, domain,
-                              pd->user, attrs, &res);
+    ret = sysdb_get_user_attr(state, domain, pd->user, attrs, &res);
     if (ret != EOK) {
         if (ret == ENOENT) {
             /* If we can't find the user, return access denied */
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index c16d48495..fa69097fa 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -1222,8 +1222,7 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state)
         }
     }
 
-    ret = sysdb_get_direct_parents(tmp_ctx, state->sysdb, state->dom,
-                                   SYSDB_MEMBER_USER,
+    ret = sysdb_get_direct_parents(tmp_ctx, state->dom, SYSDB_MEMBER_USER,
                                    state->username, &sysdb_parent_name_list);
     if (ret) {
         DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n",
@@ -1308,8 +1307,7 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_get_direct_parents(tmp_ctx, sysdb, dom,
-                                   SYSDB_MEMBER_GROUP,
+    ret = sysdb_get_direct_parents(tmp_ctx, dom, SYSDB_MEMBER_GROUP,
                                    group_name, &sysdb_parents_names_list);
     if (ret) {
         DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n",
@@ -1977,8 +1975,7 @@ rfc2307bis_group_memberships_build(hash_entry_t *item, void *user_data)
         goto done;
     }
 
-    ret = sysdb_get_direct_parents(tmp_ctx, mstate->sysdb, mstate->dom,
-                                   SYSDB_MEMBER_GROUP,
+    ret = sysdb_get_direct_parents(tmp_ctx, mstate->dom, SYSDB_MEMBER_GROUP,
                                    group_name, &sysdb_parents_names_list);
     if (ret) {
         DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n",
@@ -2038,8 +2035,7 @@ errno_t save_rfc2307bis_user_memberships(
     }
     in_transaction = true;
 
-    ret = sysdb_get_direct_parents(tmp_ctx, state->sysdb, state->dom,
-                                   SYSDB_MEMBER_USER,
+    ret = sysdb_get_direct_parents(tmp_ctx, state->dom, SYSDB_MEMBER_USER,
                                    state->name, &sysdb_parent_name_list);
     if (ret) {
         DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n",
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 963aad2d0..a0db2e56d 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -100,7 +100,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx,
     /* Canonicalize the username in case it was actually an alias */
 
     if (ctx->fast_alias == true) {
-        ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd);
+        ret = sysdb_getpwuid(tmpctx, dom, uid, &cached_pwd);
         if (ret != EOK) {
             /* Non-fatal, attempt to canonicalize online */
             DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n",
@@ -836,7 +836,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx,
 
     /* Canonicalize the group name in case it was actually an alias */
     if (ctx->fast_alias == true) {
-        ret = sysdb_getgrgid(tmpctx, sysdb, dom, gid, &cached_grp);
+        ret = sysdb_getgrgid(tmpctx, dom, gid, &cached_grp);
         if (ret != EOK) {
             /* Non-fatal, attempt to canonicalize online */
             DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n",
@@ -1206,7 +1206,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx,
 
     /* Canonicalize the username in case it was actually an alias */
     if (ctx->fast_alias == true) {
-        ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd);
+        ret = sysdb_getpwuid(tmpctx, dom, uid, &cached_pwd);
         if (ret != EOK) {
             /* Non-fatal, attempt to canonicalize online */
             DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n",