sysdb refactoring: deleted domain variables in sysdb API

The patch also updates code using modified functions. Tests have also
been adjusted.

6 files changed, 12 insertions, 17 deletions

diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c
index 3bd377320..74136d31c 100644
--- a/src/providers/ipa/ipa_access.c
+++ b/src/providers/ipa/ipa_access.c
@@ -605,7 +605,6 @@ static errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx,
 {
     errno_t ret;
     struct sysdb_ctx *sysdb = hbac_ctx_sysdb(hbac_ctx);
-    struct sss_domain_info *domain = hbac_ctx_be(hbac_ctx)->domain;
     size_t count;
     struct ldb_message **msgs;
     TALLOC_CTX *tmp_ctx;
@@ -635,7 +634,7 @@ static errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_custom(mem_ctx, sysdb, domain, filter,
+    ret = sysdb_search_custom(mem_ctx, sysdb, filter,
                               HBAC_RULES_SUBDIR, attrs,
                               &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
diff --git a/src/providers/ipa/ipa_auth.c b/src/providers/ipa/ipa_auth.c
index d8d8ad5ae..f0bdd429e 100644
--- a/src/providers/ipa/ipa_auth.c
+++ b/src/providers/ipa/ipa_auth.c
@@ -363,7 +363,6 @@ static void ipa_get_migration_flag_done(struct tevent_req *req)
         attrs[1] = NULL;
 
         ret = sysdb_search_user_by_name(state, state->be_req->be_ctx->sysdb,
-                                        state->be_req->be_ctx->domain,
                                         state->pd->user, attrs, &user_msg);
         if (ret != EOK) {
             DEBUG(1, ("sysdb_search_user_by_name failed.\n"));
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
index 4633f2f9e..36c67e492 100644
--- a/src/providers/ipa/ipa_hbac_common.c
+++ b/src/providers/ipa/ipa_hbac_common.c
@@ -77,8 +77,7 @@ ipa_hbac_save_list(struct sysdb_ctx *sysdb, bool delete_subdir,
         }
         DEBUG(9, ("Object name: [%s].\n", object_name));
 
-        ret = sysdb_store_custom(tmp_ctx, sysdb, domain, object_name, subdir,
-                                 list[c]);
+        ret = sysdb_store_custom(tmp_ctx, sysdb, object_name, subdir, list[c]);
         if (ret != EOK) {
             DEBUG(1, ("sysdb_store_custom failed.\n"));
             goto done;
@@ -210,7 +209,7 @@ ipa_hbac_sysdb_save(struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
                     goto done;
                 }
 
-                ret = sysdb_search_custom(tmp_ctx, sysdb, domain,
+                ret = sysdb_search_custom(tmp_ctx, sysdb, 
                                           member_filter, primary_subdir,
                                           NULL, &member_count, &members);
                 talloc_zfree(member_filter);
@@ -625,8 +624,7 @@ hbac_eval_user_element(TALLOC_CTX *mem_ctx,
      * This will give us the list of both POSIX and
      * non-POSIX groups that this user belongs to.
      */
-    ret = sysdb_search_user_by_name(tmp_ctx, sysdb, domain,
-                                    users->name, attrs, &msg);
+    ret = sysdb_search_user_by_name(tmp_ctx, sysdb, users->name, attrs, &msg);
     if (ret != EOK) {
         DEBUG(1, ("Could not determine user memberships for [%s]\n",
                   users->name));
@@ -734,7 +732,7 @@ hbac_eval_service_element(TALLOC_CTX *mem_ctx,
     }
 
     /* Find the service groups */
-    ret = sysdb_asq_search(tmp_ctx, sysdb, domain, svc_dn,
+    ret = sysdb_asq_search(tmp_ctx, sysdb, svc_dn,
                            service_filter, SYSDB_MEMBEROF,
                            attrs, &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
@@ -835,7 +833,7 @@ hbac_eval_host_element(TALLOC_CTX *mem_ctx,
     }
 
     /* Find the host groups */
-    ret = sysdb_asq_search(tmp_ctx, sysdb, domain, host_dn,
+    ret = sysdb_asq_search(tmp_ctx, sysdb, host_dn,
                            host_filter, SYSDB_MEMBEROF,
                            attrs, &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c
index 4e753f374..15522f49f 100644
--- a/src/providers/ipa/ipa_hbac_hosts.c
+++ b/src/providers/ipa/ipa_hbac_hosts.c
@@ -331,7 +331,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, sysdb, domain, filter,
+        ret = sysdb_search_custom(tmp_ctx, sysdb, filter,
                                   HBAC_HOSTS_SUBDIR, attrs,
                                   &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
@@ -367,7 +367,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, sysdb, domain, filter,
+            ret = sysdb_search_custom(tmp_ctx, sysdb, 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 df276b86c..fa580977c 100644
--- a/src/providers/ipa/ipa_hbac_services.c
+++ b/src/providers/ipa/ipa_hbac_services.c
@@ -345,7 +345,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx,
         }
 
         /* First check if this is a specific service */
-        ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter,
+        ret = sysdb_search_custom(tmp_ctx, sysdb, filter,
                                   HBAC_SERVICES_SUBDIR, attrs,
                                   &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
@@ -380,7 +380,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, sysdb, domain, filter,
+            ret = sysdb_search_custom(tmp_ctx, sysdb, 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 9b7cadb2e..888f866d5 100644
--- a/src/providers/ipa/ipa_hbac_users.c
+++ b/src/providers/ipa/ipa_hbac_users.c
@@ -232,8 +232,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx,
         }
 
         /* First check if this is a user */
-        ret = sysdb_search_users(tmp_ctx, sysdb, domain,
-                                 filter, attrs, &count, &msgs);
+        ret = sysdb_search_users(tmp_ctx, sysdb, filter, attrs, &count, &msgs);
         if (ret != EOK && ret != ENOENT) goto done;
         if (ret == EOK && count == 0) {
             ret = ENOENT;
@@ -265,7 +264,7 @@ 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, sysdb, domain,
+            ret = sysdb_search_groups(tmp_ctx, sysdb,
                                       filter, attrs, &count, &msgs);
             if (ret != EOK && ret != ENOENT) goto done;
             if (ret == EOK && count == 0) {