SYSDB: Drop the sysdb_ctx parameter from the sysdb_services module

6 files changed, 26 insertions, 33 deletions

diff --git a/src/providers/ldap/ldap_id_services.c b/src/providers/ldap/ldap_id_services.c
index 1f3fd8043..04de1dbc4 100644
--- a/src/providers/ldap/ldap_id_services.c
+++ b/src/providers/ldap/ldap_id_services.c
@@ -254,7 +254,7 @@ services_get_done(struct tevent_req *subreq)
         /* Ensure that this entry is removed from the sysdb */
         switch(state->filter_type) {
         case BE_FILTER_NAME:
-            ret = sysdb_svc_delete(state->sysdb, state->domain, state->name,
+            ret = sysdb_svc_delete(state->domain, state->name,
                                    0, state->protocol);
             if (ret != EOK) {
                 tevent_req_error(req, ret);
@@ -269,8 +269,8 @@ services_get_done(struct tevent_req *subreq)
                 return;
             }
 
-            ret = sysdb_svc_delete(state->sysdb, state->domain, NULL,
-                                   port, state->protocol);
+            ret = sysdb_svc_delete(state->domain, NULL,  port,
+                                   state->protocol);
             if (ret != EOK) {
                 tevent_req_error(req, ret);
                 return;
diff --git a/src/providers/ldap/sdap_async_services.c b/src/providers/ldap/sdap_async_services.c
index c4245f057..b36245962 100644
--- a/src/providers/ldap/sdap_async_services.c
+++ b/src/providers/ldap/sdap_async_services.c
@@ -475,7 +475,7 @@ sdap_save_service(TALLOC_CTX *mem_ctx,
 
     cache_timeout = dom->service_timeout;
 
-    ret = sysdb_store_service(sysdb, dom, name, port, aliases, store_protocols,
+    ret = sysdb_store_service(dom, name, port, aliases, store_protocols,
                               svc_attrs, missing, cache_timeout, now);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c
index 6a7f02cb3..66d73102e 100644
--- a/src/providers/ldap/sdap_reinit.c
+++ b/src/providers/ldap/sdap_reinit.c
@@ -37,8 +37,7 @@ struct sdap_reinit_cleanup_state {
 static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb,
                                      struct sss_domain_info *domain);
 static void sdap_reinit_cleanup_done(struct tevent_req *subreq);
-static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb,
-                                          struct sss_domain_info *domain);
+static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain);
 
 struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx,
                                             struct be_ctx *be_ctx,
@@ -165,8 +164,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb,
     msgs_num = 0;
 
     /* reset services' usn */
-    ret = sysdb_search_services(tmp_ctx, sysdb, domain,
-                                "", attrs, &msgs_num, &msgs);
+    ret = sysdb_search_services(tmp_ctx, domain, "", attrs, &msgs_num, &msgs);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE,
               ("Cannot search services [%d]: %s\n", ret, strerror(ret)));
@@ -226,7 +224,7 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq)
         /* This error is non-fatal, so continue */
     }
 
-    ret = sdap_reinit_delete_records(state->sysdb, state->domain);
+    ret = sdap_reinit_delete_records(state->domain);
     if (ret != EOK) {
         goto fail;
     }
@@ -254,8 +252,7 @@ static void sdap_delete_msgs_dn(struct sysdb_ctx *sysdb,
     }
 }
 
-static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb,
-                                          struct sss_domain_info *domain)
+static errno_t sdap_reinit_delete_records(struct sss_domain_info *domain)
 {
     TALLOC_CTX *tmp_ctx = NULL;
     bool in_transaction = false;
@@ -264,6 +261,7 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb,
     const char *attrs[] = { "dn", NULL };
     int sret;
     errno_t ret;
+    struct sysdb_ctx *sysdb = domain->sysdb;
 
     tmp_ctx = talloc_new(NULL);
     if (tmp_ctx == NULL) {
@@ -298,7 +296,7 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb,
     msgs_num = 0;
 
     /* purge untouched services */
-    ret = sysdb_search_services(tmp_ctx, sysdb, domain, "(!("SYSDB_USN"=*))",
+    ret = sysdb_search_services(tmp_ctx, domain, "(!("SYSDB_USN"=*))",
                                 attrs, &msgs_num, &msgs);
     sdap_delete_msgs_dn(sysdb, msgs, msgs_num);
     talloc_zfree(msgs);
diff --git a/src/providers/proxy/proxy.h b/src/providers/proxy/proxy.h
index 29dad6d51..179245fed 100644
--- a/src/providers/proxy/proxy.h
+++ b/src/providers/proxy/proxy.h
@@ -154,14 +154,12 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx,
                      const char *name);
 
 errno_t get_serv_byname(struct proxy_id_ctx *ctx,
-                        struct sysdb_ctx *sysdb,
                         struct sss_domain_info *dom,
                         const char *name,
                         const char *protocol);
 
 errno_t
 get_serv_byport(struct proxy_id_ctx *ctx,
-                struct sysdb_ctx *sysdb,
                 struct sss_domain_info *dom,
                 const char *be_filter,
                 const char *protocol);
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index a0db2e56d..625d72bc7 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -1477,7 +1477,7 @@ void proxy_get_account_info(struct be_req *breq)
                 return be_req_terminate(breq, DP_ERR_FATAL,
                                    ENODEV, "Services are not supported");
             }
-            ret = get_serv_byname(ctx, sysdb, domain,
+            ret = get_serv_byname(ctx, domain,
                                   ar->filter_value,
                                   ar->extra_value);
             break;
@@ -1486,7 +1486,7 @@ void proxy_get_account_info(struct be_req *breq)
                 return be_req_terminate(breq, DP_ERR_FATAL,
                                    ENODEV, "Services are not supported");
             }
-            ret = get_serv_byport(ctx, sysdb, domain,
+            ret = get_serv_byport(ctx, domain,
                                   ar->filter_value,
                                   ar->extra_value);
             break;
diff --git a/src/providers/proxy/proxy_services.c b/src/providers/proxy/proxy_services.c
index 474959039..a32537236 100644
--- a/src/providers/proxy/proxy_services.c
+++ b/src/providers/proxy/proxy_services.c
@@ -28,8 +28,7 @@
 #define BUFLEN  1024
 
 errno_t
-proxy_save_service(struct sysdb_ctx *sysdb,
-                   struct sss_domain_info *domain,
+proxy_save_service(struct sss_domain_info *domain,
                    struct servent *svc,
                    bool lowercase,
                    uint64_t cache_timeout)
@@ -72,7 +71,7 @@ proxy_save_service(struct sysdb_ctx *sysdb,
         goto done;
     }
 
-    ret = sysdb_store_service(sysdb, domain,
+    ret = sysdb_store_service(domain,
                               cased_name,
                               ntohs(svc->s_port),
                               cased_aliases,
@@ -87,7 +86,6 @@ done:
 
 errno_t
 get_serv_byname(struct proxy_id_ctx *ctx,
-                struct sysdb_ctx *sysdb,
                 struct sss_domain_info *dom,
                 const char *name,
                 const char *protocol)
@@ -117,11 +115,11 @@ get_serv_byname(struct proxy_id_ctx *ctx,
 
     if (status == NSS_STATUS_NOTFOUND) {
         /* Make sure we remove it from the cache */
-        ret = sysdb_svc_delete(sysdb, dom, name, 0, protocol);
+        ret = sysdb_svc_delete(dom, name, 0, protocol);
     } else {
 
         /* Results found. Save them into the cache */
-        ret = proxy_save_service(sysdb, dom, result,
+        ret = proxy_save_service(dom, result,
                                  !dom->case_sensitive,
                                  dom->service_timeout);
     }
@@ -133,7 +131,6 @@ done:
 
 errno_t
 get_serv_byport(struct proxy_id_ctx *ctx,
-                struct sysdb_ctx *sysdb,
                 struct sss_domain_info *dom,
                 const char *be_filter,
                 const char *protocol)
@@ -171,10 +168,10 @@ get_serv_byport(struct proxy_id_ctx *ctx,
 
     if (status == NSS_STATUS_NOTFOUND) {
         /* Make sure we remove it from the cache */
-        ret = sysdb_svc_delete(sysdb, dom, NULL, port, protocol);
+        ret = sysdb_svc_delete(dom, NULL, port, protocol);
     } else {
         /* Results found. Save them into the cache */
-        ret = proxy_save_service(sysdb, dom, result,
+        ret = proxy_save_service(dom, result,
                                  !dom->case_sensitive,
                                  dom->service_timeout);
     }
@@ -309,14 +306,14 @@ enum_services(struct proxy_id_ctx *ctx,
                     break;
                 }
 
-                ret = sysdb_store_service(sysdb, dom,
-                        svc->s_name,
-                        svc->s_port,
-                        cased_aliases,
-                        protocols,
-                        NULL, NULL,
-                        dom->service_timeout,
-                        now);
+                ret = sysdb_store_service(dom,
+                                          svc->s_name,
+                                          svc->s_port,
+                                          cased_aliases,
+                                          protocols,
+                                          NULL, NULL,
+                                          dom->service_timeout,
+                                          now);
                 if (ret) {
                     /* Do not fail completely on errors.
                      * Just report the failure to save and go on */