SYSDB: Drop the sysdb_ctx parameter from the sysdb_ssh module

2 files changed, 19 insertions, 30 deletions

diff --git a/src/db/sysdb_ssh.c b/src/db/sysdb_ssh.c
index 469425f68..af66644b9 100644
--- a/src/db/sysdb_ssh.c
+++ b/src/db/sysdb_ssh.c
@@ -24,14 +24,14 @@
 #include "db/sysdb_private.h"
 
 static errno_t
-sysdb_update_ssh_host(struct sysdb_ctx *sysdb,
-                      struct sss_domain_info *domain,
+sysdb_update_ssh_host(struct sss_domain_info *domain,
                       const char *name,
                       struct sysdb_attrs *attrs)
 {
     errno_t ret;
 
-    ret = sysdb_store_custom(sysdb, domain, name, SSH_HOSTS_SUBDIR, attrs);
+    ret = sysdb_store_custom(domain->sysdb, domain, name, SSH_HOSTS_SUBDIR,
+                             attrs);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
               ("Error storing host %s [%d]: %s\n", name, ret, strerror(ret)));
@@ -42,8 +42,7 @@ sysdb_update_ssh_host(struct sysdb_ctx *sysdb,
 }
 
 errno_t
-sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
-                     struct sss_domain_info *domain,
+sysdb_store_ssh_host(struct sss_domain_info *domain,
                      const char *name,
                      const char *alias,
                      time_t now,
@@ -65,7 +64,7 @@ sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
         return ENOMEM;
     }
 
-    ret = sysdb_transaction_start(sysdb);
+    ret = sysdb_transaction_start(domain->sysdb);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n"));
         goto done;
@@ -73,7 +72,7 @@ sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
 
     in_transaction = true;
 
-    ret = sysdb_get_ssh_host(tmp_ctx, sysdb, domain, name, search_attrs, &host);
+    ret = sysdb_get_ssh_host(tmp_ctx, domain, name, search_attrs, &host);
     if (ret != EOK && ret != ENOENT) {
         goto done;
     }
@@ -148,12 +147,12 @@ sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    ret = sysdb_update_ssh_host(sysdb, domain, name, attrs);
+    ret = sysdb_update_ssh_host(domain, name, attrs);
     if (ret != EOK) {
         goto done;
     }
 
-    ret = sysdb_transaction_commit(sysdb);
+    ret = sysdb_transaction_commit(domain->sysdb);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n"));
         goto done;
@@ -165,7 +164,7 @@ sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
 
 done:
     if (in_transaction) {
-        sret = sysdb_transaction_cancel(sysdb);
+        sret = sysdb_transaction_cancel(domain->sysdb);
         if (sret != EOK) {
             DEBUG(SSSDBG_CRIT_FAILURE, ("Could not cancel transaction\n"));
         }
@@ -177,8 +176,7 @@ done:
 }
 
 errno_t
-sysdb_update_ssh_known_host_expire(struct sysdb_ctx *sysdb,
-                                   struct sss_domain_info *domain,
+sysdb_update_ssh_known_host_expire(struct sss_domain_info *domain,
                                    const char *name,
                                    time_t now,
                                    int known_hosts_timeout)
@@ -210,7 +208,7 @@ sysdb_update_ssh_known_host_expire(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    ret = sysdb_update_ssh_host(sysdb, domain, name, attrs);
+    ret = sysdb_update_ssh_host(domain, name, attrs);
     if (ret != EOK) {
         goto done;
     }
@@ -224,17 +222,15 @@ done:
 }
 
 errno_t
-sysdb_delete_ssh_host(struct sysdb_ctx *sysdb,
-                      struct sss_domain_info *domain,
+sysdb_delete_ssh_host(struct sss_domain_info *domain,
                       const char *name)
 {
     DEBUG(SSSDBG_TRACE_FUNC, ("Deleting host %s\n", name));
-    return sysdb_delete_custom(sysdb, domain, name, SSH_HOSTS_SUBDIR);
+    return sysdb_delete_custom(domain->sysdb, domain, name, SSH_HOSTS_SUBDIR);
 }
 
 static errno_t
 sysdb_search_ssh_hosts(TALLOC_CTX *mem_ctx,
-                       struct sysdb_ctx *sysdb,
                        struct sss_domain_info *domain,
                        const char *filter,
                        const char **attrs,
@@ -251,7 +247,7 @@ sysdb_search_ssh_hosts(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    ret = sysdb_search_custom(tmp_ctx, sysdb, domain, filter,
+    ret = sysdb_search_custom(tmp_ctx, domain->sysdb, domain, filter,
                               SSH_HOSTS_SUBDIR, attrs,
                               &num_results, &results);
     if (ret != EOK && ret != ENOENT) {
@@ -278,7 +274,6 @@ done:
 
 errno_t
 sysdb_get_ssh_host(TALLOC_CTX *mem_ctx,
-                   struct sysdb_ctx *sysdb,
                    struct sss_domain_info *domain,
                    const char *name,
                    const char **attrs,
@@ -301,7 +296,7 @@ sysdb_get_ssh_host(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_ssh_hosts(tmp_ctx, sysdb, domain, filter, attrs,
+    ret = sysdb_search_ssh_hosts(tmp_ctx, domain, filter, attrs,
                                  &hosts, &num_hosts);
     if (ret != EOK) {
         goto done;
@@ -325,7 +320,6 @@ done:
 
 errno_t
 sysdb_get_ssh_known_hosts(TALLOC_CTX *mem_ctx,
-                          struct sysdb_ctx *sysdb,
                           struct sss_domain_info *domain,
                           time_t now,
                           const char **attrs,
@@ -348,7 +342,7 @@ sysdb_get_ssh_known_hosts(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_ssh_hosts(mem_ctx, sysdb, domain, filter, attrs,
+    ret = sysdb_search_ssh_hosts(mem_ctx, domain, filter, attrs,
                                  hosts, num_hosts);
 
 done:
diff --git a/src/db/sysdb_ssh.h b/src/db/sysdb_ssh.h
index 2b0bbc437..e8aca776b 100644
--- a/src/db/sysdb_ssh.h
+++ b/src/db/sysdb_ssh.h
@@ -30,28 +30,24 @@
 #define SYSDB_SSH_KNOWN_HOSTS_EXPIRE "sshKnownHostsExpire"
 
 errno_t
-sysdb_store_ssh_host(struct sysdb_ctx *sysdb,
-                     struct sss_domain_info *domain,
+sysdb_store_ssh_host(struct sss_domain_info *domain,
                      const char *name,
                      const char *alias,
                      time_t now,
                      struct sysdb_attrs *attrs);
 
 errno_t
-sysdb_update_ssh_known_host_expire(struct sysdb_ctx *sysdb,
-                                   struct sss_domain_info *domain,
+sysdb_update_ssh_known_host_expire(struct sss_domain_info *domain,
                                    const char *name,
                                    time_t now,
                                    int known_hosts_timeout);
 
 errno_t
-sysdb_delete_ssh_host(struct sysdb_ctx *sysdb,
-                      struct sss_domain_info *domain,
+sysdb_delete_ssh_host(struct sss_domain_info *domain,
                       const char *name);
 
 errno_t
 sysdb_get_ssh_host(TALLOC_CTX *mem_ctx,
-                   struct sysdb_ctx *sysdb,
                    struct sss_domain_info *domain,
                    const char *name,
                    const char **attrs,
@@ -59,7 +55,6 @@ sysdb_get_ssh_host(TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_get_ssh_known_hosts(TALLOC_CTX *mem_ctx,
-                          struct sysdb_ctx *sysdb,
                           struct sss_domain_info *domain,
                           time_t now,
                           const char **attrs,