SYSDB: Drop the sysdb_ctx parameter from the sysdb_ssh module

5 files changed, 28 insertions, 45 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,
diff --git a/src/providers/ipa/ipa_hostid.c b/src/providers/ipa/ipa_hostid.c
index 7afe350a8..2ebe98688 100644
--- a/src/providers/ipa/ipa_hostid.c
+++ b/src/providers/ipa/ipa_hostid.c
@@ -272,8 +272,7 @@ hosts_get_done(struct tevent_req *subreq)
         DEBUG(SSSDBG_OP_FAILURE,
               ("No host with name [%s] found.\n", state->name));
 
-        ret = sysdb_delete_ssh_host(state->domain->sysdb, state->domain,
-                                    state->name);
+        ret = sysdb_delete_ssh_host(state->domain, state->name);
         if (ret != EOK && ret != ENOENT) {
             goto done;
         }
@@ -301,8 +300,7 @@ hosts_get_done(struct tevent_req *subreq)
         goto done;
     }
 
-    ret = sysdb_store_ssh_host(state->domain->sysdb, state->domain,
-                               state->name, state->alias, now,
+    ret = sysdb_store_ssh_host(state->domain, state->name, state->alias, now,
                                attrs);
     if (ret != EOK) {
         goto done;
diff --git a/src/responder/ssh/sshsrv_cmd.c b/src/responder/ssh/sshsrv_cmd.c
index 5fab78ee4..b619a82d6 100644
--- a/src/responder/ssh/sshsrv_cmd.c
+++ b/src/responder/ssh/sshsrv_cmd.c
@@ -355,7 +355,7 @@ ssh_host_pubkeys_search_next(struct ssh_cmd_ctx *cmd_ctx)
         return EFAULT;
     }
 
-    ret = sysdb_get_ssh_host(cmd_ctx, sysdb, cmd_ctx->domain,
+    ret = sysdb_get_ssh_host(cmd_ctx, cmd_ctx->domain,
                              cmd_ctx->name, attrs, &cmd_ctx->result);
     if (ret != EOK && ret != ENOENT) {
         DEBUG(SSSDBG_CRIT_FAILURE,
@@ -563,8 +563,7 @@ ssh_host_pubkeys_update_known_hosts(struct ssh_cmd_ctx *cmd_ctx)
     }
 
     if (cmd_ctx->domain) {
-        ret = sysdb_update_ssh_known_host_expire(cmd_ctx->domain->sysdb,
-                                                 cmd_ctx->domain,
+        ret = sysdb_update_ssh_known_host_expire(cmd_ctx->domain,
                                                  cmd_ctx->name, now,
                                                  ssh_ctx->known_hosts_timeout);
         if (ret != EOK && ret != ENOENT) {
@@ -597,7 +596,7 @@ ssh_host_pubkeys_update_known_hosts(struct ssh_cmd_ctx *cmd_ctx)
             goto done;
         }
 
-        ret = sysdb_get_ssh_known_hosts(tmp_ctx, sysdb, dom, now, attrs,
+        ret = sysdb_get_ssh_known_hosts(tmp_ctx, dom, now, attrs,
                                         &hosts, &num_hosts);
         if (ret != EOK) {
             if (ret != ENOENT) {
diff --git a/src/tests/sysdb_ssh-tests.c b/src/tests/sysdb_ssh-tests.c
index 95c57a7eb..114c33ca7 100644
--- a/src/tests/sysdb_ssh-tests.c
+++ b/src/tests/sysdb_ssh-tests.c
@@ -172,8 +172,7 @@ static int test_sysdb_store_ssh_host(struct test_data *data)
     int ret;
     time_t now = time(NULL);
 
-    ret = sysdb_store_ssh_host(data->ctx->sysdb,
-                               data->ctx->domain,
+    ret = sysdb_store_ssh_host(data->ctx->domain,
                                data->hostname,
                                data->alias,
                                now,
@@ -185,8 +184,7 @@ static int test_sysdb_delete_ssh_host(struct test_data *data)
 {
     int ret;
 
-    ret = sysdb_delete_ssh_host(data->ctx->sysdb,
-                                data->ctx->domain, data->hostname);
+    ret = sysdb_delete_ssh_host(data->ctx->domain, data->hostname);
     return ret;
 }
 
@@ -195,9 +193,8 @@ static int test_sysdb_get_ssh_host(struct test_data *data)
     int ret;
     const char *attrs[] = { SYSDB_NAME, NULL };
 
-    ret = sysdb_get_ssh_host(data->ctx, data->ctx->sysdb,
-                             data->ctx->domain, data->hostname, attrs,
-                             &data->host);
+    ret = sysdb_get_ssh_host(data->ctx, data->ctx->domain, data->hostname,
+                             attrs, &data->host);
 
     return ret;
 }