SYSDB: Drop the sysdb_ctx parameter from the sysdb_services module

11 files changed, 71 insertions, 97 deletions

diff --git a/src/db/sysdb_services.c b/src/db/sysdb_services.c
index b8ac9ef7d..b202456ab 100644
--- a/src/db/sysdb_services.c
+++ b/src/db/sysdb_services.c
@@ -40,7 +40,6 @@ sysdb_svc_remove_alias(struct sysdb_ctx *sysdb,
 
 errno_t
 sysdb_getservbyname(TALLOC_CTX *mem_ctx,
-                    struct sysdb_ctx *sysdb,
                     struct sss_domain_info *domain,
                     const char *name,
                     const char *proto,
@@ -81,7 +80,7 @@ sysdb_getservbyname(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_services(mem_ctx, sysdb, domain, subfilter,
+    ret = sysdb_search_services(mem_ctx, domain, subfilter,
                                 attrs, &msgs_count, &msgs);
     if (ret == EOK) {
         res = talloc_zero(mem_ctx, struct ldb_result);
@@ -102,7 +101,6 @@ done:
 
 errno_t
 sysdb_getservbyport(TALLOC_CTX *mem_ctx,
-                    struct sysdb_ctx *sysdb,
                     struct sss_domain_info *domain,
                     int port,
                     const char *proto,
@@ -141,7 +139,7 @@ sysdb_getservbyport(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_services(mem_ctx, sysdb, domain, subfilter,
+    ret = sysdb_search_services(mem_ctx, domain, subfilter,
                                 attrs, &msgs_count, &msgs);
     if (ret == EOK) {
         res = talloc_zero(mem_ctx, struct ldb_result);
@@ -162,8 +160,7 @@ done:
 }
 
 errno_t
-sysdb_store_service(struct sysdb_ctx *sysdb,
-                    struct sss_domain_info *domain,
+sysdb_store_service(struct sss_domain_info *domain,
                     const char *primary_name,
                     int port,
                     const char **aliases,
@@ -182,10 +179,13 @@ sysdb_store_service(struct sysdb_ctx *sysdb,
     unsigned int i;
     struct ldb_dn *update_dn = NULL;
     struct sysdb_attrs *attrs;
+    struct sysdb_ctx *sysdb;
 
     tmp_ctx = talloc_new(NULL);
     if (!tmp_ctx) return ENOMEM;
 
+    sysdb = domain->sysdb;
+
     ret = sysdb_transaction_start(sysdb);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n"));
@@ -201,7 +201,7 @@ sysdb_store_service(struct sysdb_ctx *sysdb,
      * properly. Last entry saved to the cache should
      * always "win".
      */
-    ret = sysdb_getservbyport(tmp_ctx, sysdb, domain, port, NULL, &res);
+    ret = sysdb_getservbyport(tmp_ctx, domain, port, NULL, &res);
     if (ret != EOK && ret != ENOENT) {
         goto done;
     } else if (ret != ENOENT) {
@@ -267,7 +267,7 @@ sysdb_store_service(struct sysdb_ctx *sysdb,
      * need to update existing entries or modify
      * aliases.
      */
-    ret = sysdb_getservbyname(tmp_ctx, sysdb, domain, primary_name, NULL, &res);
+    ret = sysdb_getservbyname(tmp_ctx, domain, primary_name, NULL, &res);
     if (ret != EOK && ret != ENOENT) {
         goto done;
     } else if (ret != ENOENT) { /* Found entries */
@@ -351,7 +351,7 @@ sysdb_store_service(struct sysdb_ctx *sysdb,
         ret = sysdb_svc_update(sysdb, update_dn, port, aliases, protocols);
     } else {
         /* Add a new entry */
-        ret = sysdb_svc_add(tmp_ctx, sysdb, domain, primary_name, port,
+        ret = sysdb_svc_add(tmp_ctx, domain, primary_name, port,
                             aliases, protocols, &update_dn);
     }
     if (ret != EOK) goto done;
@@ -430,7 +430,6 @@ sysdb_svc_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_svc_add(TALLOC_CTX *mem_ctx,
-              struct sysdb_ctx *sysdb,
               struct sss_domain_info *domain,
               const char *primary_name,
               int port,
@@ -454,7 +453,7 @@ sysdb_svc_add(TALLOC_CTX *mem_ctx,
     }
 
     /* svc dn */
-    msg->dn = sysdb_svc_dn(sysdb, msg, domain->name, primary_name);
+    msg->dn = sysdb_svc_dn(domain->sysdb, msg, domain->name, primary_name);
     if (!msg->dn) {
         ret = ENOMEM;
         goto done;
@@ -513,7 +512,7 @@ sysdb_svc_add(TALLOC_CTX *mem_ctx,
                     (unsigned long)time(NULL));
     if (ret) goto done;
 
-    lret = ldb_add(sysdb->ldb, msg);
+    lret = ldb_add(domain->sysdb->ldb, msg);
     ret = sysdb_error_to_errno(lret);
 
     if (ret == EOK && dn) {
@@ -636,8 +635,7 @@ done:
 }
 
 errno_t
-sysdb_svc_delete(struct sysdb_ctx *sysdb,
-                 struct sss_domain_info *domain,
+sysdb_svc_delete(struct sss_domain_info *domain,
                  const char *name,
                  int port,
                  const char *proto)
@@ -647,6 +645,7 @@ sysdb_svc_delete(struct sysdb_ctx *sysdb,
     struct ldb_result *res;
     unsigned int i;
     bool in_transaction = false;
+    struct sysdb_ctx *sysdb = domain->sysdb;
 
     tmp_ctx = talloc_new(NULL);
     if (!tmp_ctx) {
@@ -662,7 +661,7 @@ sysdb_svc_delete(struct sysdb_ctx *sysdb,
     in_transaction = true;
 
     if (name) {
-        ret = sysdb_getservbyname(tmp_ctx, sysdb, domain, name, proto, &res);
+        ret = sysdb_getservbyname(tmp_ctx, domain, name, proto, &res);
         if (ret != EOK && ret != ENOENT) goto done;
         if (ret == ENOENT) {
             /* Doesn't exist in the DB. Nothing to do */
@@ -670,7 +669,7 @@ sysdb_svc_delete(struct sysdb_ctx *sysdb,
             goto done;
         }
     } else {
-        ret = sysdb_getservbyport(tmp_ctx, sysdb, domain, port, proto, &res);
+        ret = sysdb_getservbyport(tmp_ctx, domain, port, proto, &res);
         if (ret != EOK && ret != ENOENT) goto done;
         if (ret == ENOENT) {
             /* Doesn't exist in the DB. Nothing to do */
@@ -715,7 +714,6 @@ done:
 
 errno_t
 sysdb_enumservent(TALLOC_CTX *mem_ctx,
-                  struct sysdb_ctx *sysdb,
                   struct sss_domain_info *domain,
                   struct ldb_result **_res)
 {
@@ -731,7 +729,7 @@ sysdb_enumservent(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    ret = sysdb_search_services(mem_ctx, sysdb, domain, "",
+    ret = sysdb_search_services(mem_ctx, domain, "",
                                 attrs, &msgs_count, &msgs);
     if (ret == EOK) {
         res = talloc_zero(mem_ctx, struct ldb_result);
@@ -751,8 +749,7 @@ done:
 }
 
 errno_t
-sysdb_set_service_attr(struct sysdb_ctx *sysdb,
-                       struct sss_domain_info *domain,
+sysdb_set_service_attr(struct sss_domain_info *domain,
                        const char *name,
                        struct sysdb_attrs *attrs,
                        int mod_op)
@@ -766,13 +763,13 @@ sysdb_set_service_attr(struct sysdb_ctx *sysdb,
         return ENOMEM;
     }
 
-    dn = sysdb_svc_dn(sysdb, tmp_ctx, domain->name, name);
+    dn = sysdb_svc_dn(domain->sysdb, tmp_ctx, domain->name, name);
     if (!dn) {
         ret = ENOMEM;
         goto done;
     }
 
-    ret = sysdb_set_entry_attr(sysdb, dn, attrs, mod_op);
+    ret = sysdb_set_entry_attr(domain->sysdb, dn, attrs, mod_op);
 
 done:
     talloc_free(tmp_ctx);
@@ -780,7 +777,6 @@ done:
 }
 
 errno_t sysdb_search_services(TALLOC_CTX *mem_ctx,
-                              struct sysdb_ctx *sysdb,
                               struct sss_domain_info *domain,
                               const char *sub_filter,
                               const char **attrs,
@@ -797,7 +793,7 @@ errno_t sysdb_search_services(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    basedn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb,
+    basedn = ldb_dn_new_fmt(tmp_ctx, domain->sysdb->ldb,
                             SYSDB_TMPL_SVC_BASE, domain->name);
     if (!basedn) {
         DEBUG(SSSDBG_OP_FAILURE, ("Failed to build base dn\n"));
@@ -815,7 +811,7 @@ errno_t sysdb_search_services(TALLOC_CTX *mem_ctx,
     DEBUG(SSSDBG_TRACE_INTERNAL,
           ("Search services with filter: %s\n", filter));
 
-    ret = sysdb_search_entry(mem_ctx, sysdb, basedn,
+    ret = sysdb_search_entry(mem_ctx, domain->sysdb, basedn,
                              LDB_SCOPE_SUBTREE, filter, attrs,
                              msgs_count, msgs);
     if (ret) {
diff --git a/src/db/sysdb_services.h b/src/db/sysdb_services.h
index 2ec9a3b6b..ae058b088 100644
--- a/src/db/sysdb_services.h
+++ b/src/db/sysdb_services.h
@@ -47,7 +47,6 @@
 
 errno_t
 sysdb_getservbyname(TALLOC_CTX *mem_ctx,
-                    struct sysdb_ctx *sysdb,
                     struct sss_domain_info *domain,
                     const char *name,
                     const char *proto,
@@ -55,7 +54,6 @@ sysdb_getservbyname(TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_getservbyport(TALLOC_CTX *mem_ctx,
-                    struct sysdb_ctx *sysdb,
                     struct sss_domain_info *domain,
                     int port,
                     const char *proto,
@@ -63,13 +61,11 @@ sysdb_getservbyport(TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_enumservent(TALLOC_CTX *mem_ctx,
-                  struct sysdb_ctx *sysdb,
                   struct sss_domain_info *domain,
                   struct ldb_result **_res);
 
 errno_t
-sysdb_store_service(struct sysdb_ctx *sysdb,
-                    struct sss_domain_info *domain,
+sysdb_store_service(struct sss_domain_info *domain,
                     const char *primary_name,
                     int port,
                     const char **aliases,
@@ -85,7 +81,6 @@ sysdb_svc_dn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
 
 errno_t
 sysdb_svc_add(TALLOC_CTX *mem_ctx,
-              struct sysdb_ctx *sysdb,
               struct sss_domain_info *domain,
               const char *primary_name,
               int port,
@@ -94,21 +89,18 @@ sysdb_svc_add(TALLOC_CTX *mem_ctx,
               struct ldb_dn **dn);
 
 errno_t
-sysdb_svc_delete(struct sysdb_ctx *sysdb,
-                 struct sss_domain_info *domain,
+sysdb_svc_delete(struct sss_domain_info *domain,
                  const char *name,
                  int port,
                  const char *proto);
 
 errno_t
-sysdb_set_service_attr(struct sysdb_ctx *sysdb,
-                       struct sss_domain_info *domain,
+sysdb_set_service_attr(struct sss_domain_info *domain,
                        const char *name,
                        struct sysdb_attrs *attrs,
                        int mod_op);
 
 errno_t sysdb_search_services(TALLOC_CTX *mem_ctx,
-                              struct sysdb_ctx *sysdb,
                               struct sss_domain_info *domain,
                               const char *sub_filter,
                               const char **attrs,
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 */
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c
index 52a2f440d..390e84ef6 100644
--- a/src/responder/nss/nsssrv_services.c
+++ b/src/responder/nss/nsssrv_services.c
@@ -88,7 +88,6 @@ getserv_send(TALLOC_CTX *mem_ctx,
     size_t dom_idx = 0;
     struct nss_ctx *nctx =
             talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
-    struct sysdb_ctx *sysdb;
     time_t now = time(NULL);
     uint64_t lastUpdate;
     uint64_t cacheExpire;
@@ -165,8 +164,7 @@ getserv_send(TALLOC_CTX *mem_ctx,
          }
          if (!dom) break;
 
-         sysdb = dom->sysdb;
-         if (sysdb == NULL) {
+         if (dom->sysdb == NULL) {
              DEBUG(SSSDBG_CRIT_FAILURE,
                    ("Critical: Sysdb CTX not found for [%s]!\n", dom->name));
              ret = EINVAL;
@@ -212,7 +210,7 @@ getserv_send(TALLOC_CTX *mem_ctx,
                     SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
                     dom->name));
 
-             ret = sysdb_getservbyname(state, sysdb, dom,
+             ret = sysdb_getservbyname(state, dom,
                                        SVC_NAME_CASED,
                                        SVC_PROTO_CASED,
                                        &state->res);
@@ -253,7 +251,7 @@ getserv_send(TALLOC_CTX *mem_ctx,
                     SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
                     dom->name));
 
-             ret = sysdb_getservbyport(state, sysdb, dom, port,
+             ret = sysdb_getservbyport(state, dom, port,
                                        SVC_PROTO_CASED,
                                        &state->res);
          }
@@ -450,7 +448,6 @@ static void lookup_service_done(struct tevent_req *subreq)
     dbus_uint16_t err_maj;
     dbus_uint32_t err_min;
     char *err_msg;
-    struct sysdb_ctx *sysdb;
 
     struct tevent_req *req =
             tevent_req_callback_data(subreq, struct tevent_req);
@@ -481,8 +478,7 @@ static void lookup_service_done(struct tevent_req *subreq)
      * be returned, if it exists. Otherwise, move to the
      * next provider.
      */
-    sysdb = dom->sysdb;
-    if (sysdb == NULL) {
+    if (dom->sysdb == NULL) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               ("Critical: Sysdb CTX not found for [%s]!\n",
                 dom->name));
@@ -497,7 +493,7 @@ static void lookup_service_done(struct tevent_req *subreq)
                SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
                dom->name));
 
-        ret = sysdb_getservbyname(state, sysdb, dom,
+        ret = sysdb_getservbyname(state, dom,
                                   SVC_NAME_CASED,
                                   SVC_PROTO_CASED,
                                   &state->res);
@@ -508,7 +504,7 @@ static void lookup_service_done(struct tevent_req *subreq)
                SVC_PROTO_CASED ? SVC_PROTO_CASED : "<ANY>",
                dom->name));
 
-        ret = sysdb_getservbyport(state, sysdb, dom,
+        ret = sysdb_getservbyport(state, dom,
                                   state->port,
                                   SVC_PROTO_CASED,
                                   &state->res);
@@ -1384,7 +1380,7 @@ lookup_servent_send(TALLOC_CTX *mem_ctx,
             goto immediate;
         }
 
-        ret = sysdb_enumservent(state, sysdb, dom, &state->res);
+        ret = sysdb_enumservent(state, dom, &state->res);
         /* Whatever the result, we're done, so report it */
         goto immediate;
     }
@@ -1446,7 +1442,7 @@ lookup_servent_done(struct tevent_req *subreq)
         goto done;
     }
 
-    ret = sysdb_enumservent(state, sysdb, state->dom, &state->res);
+    ret = sysdb_enumservent(state, state->dom, &state->res);
     /* Whatever the result, we're done, so report it */
 
 done:
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 29b3be5fa..645908069 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -4035,15 +4035,14 @@ void services_check_match(struct sysdb_test_ctx *test_ctx,
 
     if (by_name) {
         /* Look up the service by name */
-        ret = sysdb_getservbyname(test_ctx, test_ctx->sysdb,
-                                  test_ctx->domain, primary_name,
+        ret = sysdb_getservbyname(test_ctx, test_ctx->domain, primary_name,
                                   NULL, &res);
         fail_if(ret != EOK, "sysdb_getservbyname error [%s]\n",
                              strerror(ret));
     } else {
         /* Look up the newly-added service by port */
-        ret = sysdb_getservbyport(test_ctx, test_ctx->sysdb,
-                                  test_ctx->domain, port, NULL, &res);
+        ret = sysdb_getservbyport(test_ctx, test_ctx->domain, port, NULL,
+                                  &res);
         fail_if(ret != EOK, "sysdb_getservbyport error [%s]\n",
                              strerror(ret));
     }
@@ -4135,7 +4134,7 @@ START_TEST(test_sysdb_add_services)
     ret = sysdb_transaction_start(test_ctx->sysdb);
     fail_if(ret != EOK, "[%s]", strerror(ret));
 
-    ret = sysdb_svc_add(NULL, test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_svc_add(NULL, test_ctx->domain,
                         primary_name, port,
                         aliases, protocols,
                         NULL);
@@ -4160,8 +4159,7 @@ START_TEST(test_sysdb_add_services)
      * doesn't like adding and deleting the same entry in a
      * single transaction.
      */
-    ret = sysdb_svc_delete(test_ctx->sysdb, test_ctx->domain,
-                           primary_name, 0, NULL);
+    ret = sysdb_svc_delete(test_ctx->domain, primary_name, 0, NULL);
     fail_if(ret != EOK, "[%s]", strerror(ret));
 
     talloc_free(test_ctx);
@@ -4209,7 +4207,7 @@ START_TEST(test_sysdb_store_services)
     fail_if(ret != EOK, "[%s]", strerror(ret));
 
     /* Store this group (which will add it) */
-    ret = sysdb_store_service(test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_store_service(test_ctx->domain,
                               primary_name, port,
                               aliases, protocols,
                               NULL, NULL, 1, 1);
@@ -4226,7 +4224,7 @@ START_TEST(test_sysdb_store_services)
                               aliases, protocols);
 
     /* Change the service name */
-    ret = sysdb_store_service(test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_store_service(test_ctx->domain,
                               alt_primary_name, port,
                               aliases, protocols,
                               NULL, NULL, 1, 1);
@@ -4243,14 +4241,14 @@ START_TEST(test_sysdb_store_services)
 
 
     /* Change it back */
-    ret = sysdb_store_service(test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_store_service(test_ctx->domain,
                               primary_name, port,
                               aliases, protocols,
                               NULL, NULL, 1, 1);
     fail_if (ret != EOK, "[%s]", strerror(ret));
 
     /* Change the port number */
-    ret = sysdb_store_service(test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_store_service(test_ctx->domain,
                               primary_name, altport,
                               aliases, protocols,
                               NULL, NULL, 1, 1);
@@ -4277,8 +4275,7 @@ START_TEST(test_sysdb_store_services)
      * doesn't like adding and deleting the same entry in a
      * single transaction.
      */
-    ret = sysdb_svc_delete(test_ctx->sysdb, test_ctx->domain,
-                           NULL, altport, NULL);
+    ret = sysdb_svc_delete(test_ctx->domain, NULL, altport, NULL);
     fail_if(ret != EOK, "[%s]", strerror(ret));
 
     talloc_free(test_ctx);
@@ -4329,7 +4326,7 @@ START_TEST(test_sysdb_svc_remove_alias)
     ret = sysdb_transaction_start(test_ctx->sysdb);
     fail_if(ret != EOK, "[%s]", strerror(ret));
 
-    ret = sysdb_svc_add(NULL, test_ctx->sysdb, test_ctx->domain,
+    ret = sysdb_svc_add(NULL, test_ctx->domain,
                         primary_name, port,
                         aliases, protocols,
                         NULL);
diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index 73e276303..a28a5e935 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -369,7 +369,7 @@ static bool invalidate_entries(TALLOC_CTX *ctx,
         break;
     case TYPE_SERVICE:
         type_string = "service";
-        ret = sysdb_search_services(ctx, sysdb, dinfo,
+        ret = sysdb_search_services(ctx, dinfo,
                                     filter, attrs, &msg_count, &msgs);
         break;
     case TYPE_AUTOFSMAP:
@@ -439,7 +439,7 @@ static errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
                             sys_attrs, SYSDB_MOD_REP);
                     break;
                 case TYPE_SERVICE:
-                    ret = sysdb_set_service_attr(sysdb, domain, name,
+                    ret = sysdb_set_service_attr(domain, name,
                                                  sys_attrs, SYSDB_MOD_REP);
                     break;
                 case TYPE_AUTOFSMAP: