From e2ac9be4f293b96f3c8992f1171e44bc1da5cfca Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzidek@redhat.com>
Date: Tue, 5 Nov 2013 18:36:57 +0100
Subject: SYSDB: Drop redundant sysdb_ctx parameter from sysdb.c

---
 src/providers/ldap/ldap_id_enum.c             | 2 +-
 src/providers/ldap/sdap_async_enum.c          | 3 +--
 src/providers/ldap/sdap_async_groups.c        | 2 +-
 src/providers/ldap/sdap_async_initgroups.c    | 3 +--
 src/providers/ldap/sdap_async_initgroups_ad.c | 3 +--
 src/providers/ldap/sdap_async_netgroups.c     | 2 +-
 src/providers/ldap/sdap_reinit.c              | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/providers/ldap')

diff --git a/src/providers/ldap/ldap_id_enum.c b/src/providers/ldap/ldap_id_enum.c
index 8cccaa916..58ff459c0 100644
--- a/src/providers/ldap/ldap_id_enum.c
+++ b/src/providers/ldap/ldap_id_enum.c
@@ -39,7 +39,7 @@ errno_t ldap_setup_enumeration(struct sdap_id_ctx *ctx,
     bool has_enumerated;
     struct ldap_enum_ctx *ectx;
 
-    ret = sysdb_has_enumerated(sdom->dom->sysdb, sdom->dom, &has_enumerated);
+    ret = sysdb_has_enumerated(sdom->dom, &has_enumerated);
     if (ret != EOK) {
         return ret;
     }
diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c
index a1bc0977c..a006d1e11 100644
--- a/src/providers/ldap/sdap_async_enum.c
+++ b/src/providers/ldap/sdap_async_enum.c
@@ -303,8 +303,7 @@ static void sdap_dom_enum_services_done(struct tevent_req *subreq)
      * process on the next SSSD service restart (to avoid
      * slowing down system boot-up
      */
-    ret = sysdb_set_enumerated(state->sdom->dom->sysdb,
-                               state->sdom->dom, true);
+    ret = sysdb_set_enumerated(state->sdom->dom, true);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE,
               ("Could not mark domain as having enumerated.\n"));
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index a943663ec..ff4f1bbc1 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -61,7 +61,7 @@ static int sdap_find_entry_by_origDN(TALLOC_CTX *memctx,
         goto done;
     }
 
-    base_dn = sysdb_domain_dn(ctx, tmpctx, domain);
+    base_dn = sysdb_domain_dn(tmpctx, domain);
     if (!base_dn) {
         ret = ENOMEM;
         goto done;
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index e869ea016..22df38148 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -2814,8 +2814,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
     }
     in_transaction = false;
 
-    ret = sysdb_get_real_name(state, state->sysdb,
-                              state->dom, state->name, &cname);
+    ret = sysdb_get_real_name(state, state->dom, state->name, &cname);
     if (ret != EOK) {
         DEBUG(SSSDBG_OP_FAILURE, ("Cannot canonicalize username\n"));
         tevent_req_error(req, ret);
diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c
index 7824f0b98..e533f07b5 100644
--- a/src/providers/ldap/sdap_async_initgroups_ad.c
+++ b/src/providers/ldap/sdap_async_initgroups_ad.c
@@ -521,8 +521,7 @@ sdap_get_ad_tokengroups_initgroups_lookup_done(struct tevent_req *subreq)
             goto done;
         }
 
-        group_ldb_dn = sysdb_group_dn(group_domain->sysdb, tmp_ctx,
-                                      group_domain, group_name);
+        group_ldb_dn = sysdb_group_dn(tmp_ctx, group_domain, group_name);
         if (group_ldb_dn == NULL) {
             DEBUG(SSSDBG_CRIT_FAILURE, ("sysdb_group_dn() failed\n"));
             ret = ENOMEM;
diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c
index 19bcc3f48..710e6c78a 100644
--- a/src/providers/ldap/sdap_async_netgroups.c
+++ b/src/providers/ldap/sdap_async_netgroups.c
@@ -324,7 +324,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx,
         goto fail;
     }
 
-    netgr_basedn = sysdb_netgroup_base_dn(sysdb, state, dom);
+    netgr_basedn = sysdb_netgroup_base_dn(state, dom);
     if (netgr_basedn == NULL) {
         ret = ENOMEM;
         goto fail;
diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c
index 51da8128d..5c909379d 100644
--- a/src/providers/ldap/sdap_reinit.c
+++ b/src/providers/ldap/sdap_reinit.c
@@ -216,7 +216,7 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq)
      * process on the next SSSD service restart (to avoid
      * slowing down system boot-up
      */
-    ret = sysdb_set_enumerated(state->sysdb, state->domain, true);
+    ret = sysdb_set_enumerated(state->domain, true);
     if (ret != EOK) {
         DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having "
                                      "enumerated.\n"));
-- 
cgit