Add domain argument to sysdb_search_custom()

Also changes sysdb_search_custom_by_name()

5 files changed, 12 insertions, 8 deletions

diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 4d4d3bde3..a82363b1e 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -723,6 +723,7 @@ int sysdb_store_custom(struct sysdb_ctx *sysdb,
 
 int sysdb_search_custom(TALLOC_CTX *mem_ctx,
                         struct sysdb_ctx *sysdb,
+                        struct sss_domain_info *domain,
                         const char *filter,
                         const char *subtree_name,
                         const char **attrs,
@@ -731,6 +732,7 @@ int sysdb_search_custom(TALLOC_CTX *mem_ctx,
 
 int sysdb_search_custom_by_name(TALLOC_CTX *mem_ctx,
                                 struct sysdb_ctx *sysdb,
+                                struct sss_domain_info *domain,
                                 const char *object_name,
                                 const char *subtree_name,
                                 const char **attrs,
diff --git a/src/db/sysdb_autofs.c b/src/db/sysdb_autofs.c
index d07f1c63d..e226662fe 100644
--- a/src/db/sysdb_autofs.c
+++ b/src/db/sysdb_autofs.c
@@ -200,7 +200,7 @@ sysdb_get_map_byname(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_custom(tmp_ctx, sysdb, filter,
+    ret = sysdb_search_custom(tmp_ctx, sysdb, sysdb->domain, filter,
                               AUTOFS_MAP_SUBDIR, attrs,
                               &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
@@ -447,7 +447,7 @@ sysdb_invalidate_autofs_maps(struct sysdb_ctx *sysdb)
         goto done;
     }
 
-    ret = sysdb_search_custom(tmp_ctx, sysdb, filter,
+    ret = sysdb_search_custom(tmp_ctx, sysdb, sysdb->domain, filter,
                               AUTOFS_MAP_SUBDIR, attrs,
                               &count, &msgs);
     if (ret != EOK && ret != ENOENT) {
diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 386f94b37..4cd94bd57 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -2009,6 +2009,7 @@ fail:
 
 int sysdb_search_custom(TALLOC_CTX *mem_ctx,
                         struct sysdb_ctx *sysdb,
+                        struct sss_domain_info *domain,
                         const char *filter,
                         const char *subtree_name,
                         const char **attrs,
@@ -2022,8 +2023,7 @@ int sysdb_search_custom(TALLOC_CTX *mem_ctx,
         return EINVAL;
     }
 
-    basedn = sysdb_custom_subtree_dn(sysdb, mem_ctx,
-                                     sysdb->domain, subtree_name);
+    basedn = sysdb_custom_subtree_dn(sysdb, mem_ctx, domain, subtree_name);
     if (basedn == NULL) {
         DEBUG(1, ("sysdb_custom_subtree_dn failed.\n"));
         return ENOMEM;
@@ -2041,6 +2041,7 @@ int sysdb_search_custom(TALLOC_CTX *mem_ctx,
 
 int sysdb_search_custom_by_name(TALLOC_CTX *mem_ctx,
                                 struct sysdb_ctx *sysdb,
+                                struct sss_domain_info *domain,
                                 const char *object_name,
                                 const char *subtree_name,
                                 const char **attrs,
@@ -2063,7 +2064,7 @@ int sysdb_search_custom_by_name(TALLOC_CTX *mem_ctx,
     }
 
     basedn = sysdb_custom_dn(sysdb, tmp_ctx,
-                             sysdb->domain, object_name, subtree_name);
+                             domain, object_name, subtree_name);
     if (basedn == NULL) {
         DEBUG(1, ("sysdb_custom_dn failed.\n"));
         ret = ENOMEM;
@@ -2129,7 +2130,7 @@ int sysdb_store_custom(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    ret = sysdb_search_custom_by_name(tmp_ctx, sysdb,
+    ret = sysdb_search_custom_by_name(tmp_ctx, sysdb, domain,
                                       object_name, subtree_name,
                                       search_attrs, &resp_count, &resp);
     if (ret != EOK && ret != ENOENT) {
diff --git a/src/db/sysdb_ssh.c b/src/db/sysdb_ssh.c
index c3e421438..d65634174 100644
--- a/src/db/sysdb_ssh.c
+++ b/src/db/sysdb_ssh.c
@@ -246,7 +246,8 @@ sysdb_search_ssh_hosts(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    ret = sysdb_search_custom(tmp_ctx, sysdb, filter, SSH_HOSTS_SUBDIR, attrs,
+    ret = sysdb_search_custom(tmp_ctx, sysdb, sysdb->domain, filter,
+                              SSH_HOSTS_SUBDIR, attrs,
                               &num_results, &results);
     if (ret != EOK && ret != ENOENT) {
         DEBUG(SSSDBG_CRIT_FAILURE,
diff --git a/src/db/sysdb_sudo.c b/src/db/sysdb_sudo.c
index beb8e5e1b..7704c02be 100644
--- a/src/db/sysdb_sudo.c
+++ b/src/db/sysdb_sudo.c
@@ -656,7 +656,7 @@ errno_t sysdb_sudo_purge_byfilter(struct sysdb_ctx *sysdb,
     NULL_CHECK(tmp_ctx, ret, done);
 
     /* match entries based on the filter and remove them one by one */
-    ret = sysdb_search_custom(tmp_ctx, sysdb, filter,
+    ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter,
                               SUDORULE_SUBDIR, attrs,
                               &count, &msgs);
     if (ret == ENOENT) {