SYSDB: Drop redundant sysdb_ctx parameter from sysdb.c

1 files changed, 11 insertions, 17 deletions

diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 3602fb45f..f7e0638b5 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -221,8 +221,7 @@ static int test_remove_user(struct test_data *data)
     struct ldb_dn *user_dn;
     int ret;
 
-    user_dn = sysdb_user_dn(data->ctx->sysdb, data,
-                            data->ctx->domain, data->username);
+    user_dn = sysdb_user_dn(data, data->ctx->domain, data->username);
     if (!user_dn) return ENOMEM;
 
     ret = sysdb_delete_entry(data->ctx->sysdb, user_dn, true);
@@ -285,8 +284,7 @@ static int test_remove_group(struct test_data *data)
     struct ldb_dn *group_dn;
     int ret;
 
-    group_dn = sysdb_group_dn(data->ctx->sysdb, data,
-                              data->ctx->domain, data->groupname);
+    group_dn = sysdb_group_dn(data, data->ctx->domain, data->groupname);
     if (!group_dn) return ENOMEM;
 
     ret = sysdb_delete_entry(data->ctx->sysdb, group_dn, true);
@@ -484,8 +482,7 @@ static int test_remove_netgroup_entry(struct test_data *data)
     struct ldb_dn *netgroup_dn;
     int ret;
 
-    netgroup_dn = sysdb_netgroup_dn(data->ctx->sysdb, data,
-                                    data->ctx->domain, data->netgrname);
+    netgroup_dn = sysdb_netgroup_dn(data, data->ctx->domain, data->netgrname);
     if (!netgroup_dn) return ENOMEM;
 
     ret = sysdb_delete_entry(data->ctx->sysdb, netgroup_dn, true);
@@ -1929,8 +1926,7 @@ START_TEST (test_sysdb_asq_search)
     data->attrlist[0] = "gidNumber";
     data->attrlist[1] = NULL;
 
-    user_dn = sysdb_user_dn(data->ctx->sysdb, data,
-                            data->ctx->domain, ASQ_TEST_USER);
+    user_dn = sysdb_user_dn(data, data->ctx->domain, ASQ_TEST_USER);
     fail_unless(user_dn != NULL, "sysdb_user_dn failed");
 
     ret = sysdb_asq_search(data, test_ctx->domain,
@@ -3618,8 +3614,7 @@ START_TEST (test_sysdb_group_dn_name)
     }
 
     groupname = talloc_asprintf(test_ctx, "testgroup%d", _i);
-    group_dn = sysdb_group_dn(test_ctx->sysdb, test_ctx,
-                              test_ctx->domain, groupname);
+    group_dn = sysdb_group_dn(test_ctx, test_ctx->domain, groupname);
     if (!group_dn || !groupname) {
         fail("Out of memory");
         return;
@@ -3682,8 +3677,7 @@ START_TEST (test_sysdb_search_netgroup_by_name)
                                         netgrname, NULL, &msg);
     fail_if(ret != EOK, "Could not find netgroup with name %s", netgrname);
 
-    netgroup_dn = sysdb_netgroup_dn(test_ctx->sysdb, test_ctx,
-                                    test_ctx->domain, netgrname);
+    netgroup_dn = sysdb_netgroup_dn(test_ctx, test_ctx->domain, netgrname);
     fail_if(netgroup_dn == NULL);
     fail_if(ldb_dn_compare(msg->dn, netgroup_dn) != 0, "Found wrong netgroup!\n");
     talloc_free(test_ctx);
@@ -3810,7 +3804,7 @@ START_TEST (test_netgroup_base_dn)
     ret = setup_sysdb_tests(&test_ctx);
     fail_if(ret != EOK, "Could not set up the test");
 
-    base_dn = sysdb_netgroup_base_dn(test_ctx->sysdb, test_ctx, test_ctx->domain);
+    base_dn = sysdb_netgroup_base_dn(test_ctx, test_ctx->domain);
     fail_if(base_dn == NULL, "Could not get netgroup base DN");
 
     strdn = ldb_dn_get_linearized(base_dn);
@@ -4327,18 +4321,18 @@ START_TEST(test_sysdb_has_enumerated)
     ret = setup_sysdb_tests(&test_ctx);
     fail_if(ret != EOK, "Could not set up the test");
 
-    ret = sysdb_has_enumerated(test_ctx->sysdb, test_ctx->domain, &enumerated);
+    ret = sysdb_has_enumerated(test_ctx->domain, &enumerated);
     fail_if(ret != EOK, "Error [%d][%s] checking enumeration",
                         ret, strerror(ret));
 
     fail_if(enumerated, "Enumeration should default to false");
 
-    ret = sysdb_set_enumerated(test_ctx->sysdb, test_ctx->domain, true);
+    ret = sysdb_set_enumerated(test_ctx->domain, true);
     fail_if(ret != EOK, "Error [%d][%s] setting enumeration",
                         ret, strerror(ret));
 
     /* Recheck enumeration status */
-    ret = sysdb_has_enumerated(test_ctx->sysdb, test_ctx->domain, &enumerated);
+    ret = sysdb_has_enumerated(test_ctx->domain, &enumerated);
     fail_if(ret != EOK, "Error [%d][%s] checking enumeration",
                         ret, strerror(ret));
 
@@ -4381,7 +4375,7 @@ START_TEST(test_sysdb_original_dn_case_insensitive)
                              "cn=case_sensitive_group1,cn=example,cn=com");
     fail_if(filter == NULL, "Cannot construct filter\n");
 
-    base_dn = sysdb_domain_dn(test_ctx->sysdb, test_ctx, test_ctx->domain);
+    base_dn = sysdb_domain_dn(test_ctx, test_ctx->domain);
     fail_if(base_dn == NULL, "Cannot construct basedn\n");
 
     ret = sysdb_search_entry(test_ctx, test_ctx->sysdb,