summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/cmocka/test_fqnames.c2
-rw-r--r--src/tests/cmocka/test_ipa_subdomains_server.c2
-rw-r--r--src/tests/cmocka/test_nss_srv.c6
-rw-r--r--src/tests/cmocka/test_sysdb_subdomains.c25
-rw-r--r--src/tests/sysdb-tests.c14
5 files changed, 26 insertions, 23 deletions
diff --git a/src/tests/cmocka/test_fqnames.c b/src/tests/cmocka/test_fqnames.c
index 19788248a..0ed42a597 100644
--- a/src/tests/cmocka/test_fqnames.c
+++ b/src/tests/cmocka/test_fqnames.c
@@ -309,7 +309,7 @@ static int parse_name_test_setup(void **state)
* discovered
*/
test_ctx->subdom = new_subdomain(dom, dom, SUBDOMNAME, NULL, SUBFLATNAME,
- NULL, false, false, NULL, NULL, 0);
+ NULL, false, false, NULL, NULL, 0, NULL);
assert_non_null(test_ctx->subdom);
check_leaks_push(test_ctx);
diff --git a/src/tests/cmocka/test_ipa_subdomains_server.c b/src/tests/cmocka/test_ipa_subdomains_server.c
index 123cf11c0..ca48425ac 100644
--- a/src/tests/cmocka/test_ipa_subdomains_server.c
+++ b/src/tests/cmocka/test_ipa_subdomains_server.c
@@ -263,7 +263,7 @@ static void add_test_subdomains(struct trust_test_ctx *test_ctx,
direction, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
}
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
index 50714715c..3d7e03821 100644
--- a/src/tests/cmocka/test_nss_srv.c
+++ b/src/tests/cmocka/test_nss_srv.c
@@ -3206,7 +3206,8 @@ static int nss_subdom_test_setup(void **state)
subdomain = new_subdomain(nss_test_ctx, nss_test_ctx->tctx->dom,
testdom[0], testdom[1], testdom[2], testdom[3],
- false, false, NULL, NULL, 0);
+ false, false, NULL, NULL, 0,
+ nss_test_ctx->tctx->confdb);
assert_non_null(subdomain);
ret = sysdb_subdomain_store(nss_test_ctx->tctx->sysdb,
@@ -3214,7 +3215,8 @@ static int nss_subdom_test_setup(void **state)
false, false, NULL, 0, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(nss_test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(nss_test_ctx->tctx->dom,
+ nss_test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
nss_test_ctx->subdom = subdomain;
diff --git a/src/tests/cmocka/test_sysdb_subdomains.c b/src/tests/cmocka/test_sysdb_subdomains.c
index 49f44998a..84bcdc17b 100644
--- a/src/tests/cmocka/test_sysdb_subdomains.c
+++ b/src/tests/cmocka/test_sysdb_subdomains.c
@@ -103,7 +103,7 @@ static void test_sysdb_subdomain_create(void **state)
false, false, NULL, 0, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
assert_non_null(test_ctx->tctx->dom->subdomains);
@@ -115,7 +115,7 @@ static void test_sysdb_subdomain_create(void **state)
false, false, NULL, 1, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
assert_non_null(test_ctx->tctx->dom->subdomains->next);
@@ -133,7 +133,7 @@ static void test_sysdb_subdomain_create(void **state)
false, false, NULL, 0, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
assert_int_equal(test_ctx->tctx->dom->subdomains->trust_direction, 1);
@@ -145,7 +145,7 @@ static void test_sysdb_subdomain_create(void **state)
ret = sysdb_subdomain_delete(test_ctx->tctx->sysdb, dom1[0]);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
assert_int_equal(sss_domain_get_state(test_ctx->tctx->dom->subdomains),
@@ -235,11 +235,11 @@ static void test_sysdb_link_forest_root_ipa(void **state)
0, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
/* Also update dom2 */
- ret = sysdb_update_subdomains(test_ctx->tctx->dom->next);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom->next, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
sub = find_domain_by_name(test_ctx->tctx->dom, dom1[0], true);
@@ -315,11 +315,11 @@ static void test_sysdb_link_forest_root_ad(void **state)
0, NULL);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
/* Also update dom2 */
- ret = sysdb_update_subdomains(test_ctx->tctx->dom->next);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom->next, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
assert_non_null(test_ctx->tctx->dom->forest_root);
@@ -395,14 +395,15 @@ static void test_sysdb_link_forest_member_ad(void **state)
ret = sysdb_master_domain_update(test_ctx->tctx->dom);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom, test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
/* Also update dom2 */
ret = sysdb_master_domain_update(test_ctx->tctx->dom->next);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(test_ctx->tctx->dom->next);
+ ret = sysdb_update_subdomains(test_ctx->tctx->dom->next,
+ test_ctx->tctx->confdb);
assert_int_equal(ret, EOK);
/* Checks */
@@ -472,7 +473,7 @@ static void test_sysdb_link_ad_multidom(void **state)
ret = sysdb_master_domain_update(main_dom1);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(main_dom1);
+ ret = sysdb_update_subdomains(main_dom1, NULL);
assert_int_equal(ret, EOK);
ret = sysdb_master_domain_add_info(main_dom2,
@@ -492,7 +493,7 @@ static void test_sysdb_link_ad_multidom(void **state)
ret = sysdb_master_domain_update(main_dom2);
assert_int_equal(ret, EOK);
- ret = sysdb_update_subdomains(main_dom2);
+ ret = sysdb_update_subdomains(main_dom2, NULL);
assert_int_equal(ret, EOK);
main_dom1 = find_domain_by_name(test_ctx->tctx->dom, TEST_DOM1_NAME, true);
diff --git a/src/tests/sysdb-tests.c b/src/tests/sysdb-tests.c
index 5bdd631fb..1767dc3c7 100644
--- a/src/tests/sysdb-tests.c
+++ b/src/tests/sysdb-tests.c
@@ -1395,7 +1395,7 @@ START_TEST (test_sysdb_get_user_attr_subdomain)
/* Create subdomain */
subdomain = new_subdomain(test_ctx, test_ctx->domain,
"test.sub", "TEST.SUB", "test", "S-3",
- false, false, NULL, NULL, 0);
+ false, false, NULL, NULL, 0, NULL);
fail_if(subdomain == NULL, "Failed to create new subdomain.");
ret = sss_names_init_from_args(test_ctx,
@@ -5821,14 +5821,14 @@ START_TEST(test_sysdb_subdomain_store_user)
subdomain = new_subdomain(test_ctx, test_ctx->domain,
testdom[0], testdom[1], testdom[2], testdom[3],
- false, false, NULL, NULL, 0);
+ false, false, NULL, NULL, 0, NULL);
fail_unless(subdomain != NULL, "Failed to create new subdomin.");
ret = sysdb_subdomain_store(test_ctx->sysdb,
testdom[0], testdom[1], testdom[2], testdom[3],
false, false, NULL, 0, NULL);
fail_if(ret != EOK, "Could not set up the test (test subdom)");
- ret = sysdb_update_subdomains(test_ctx->domain);
+ ret = sysdb_update_subdomains(test_ctx->domain, NULL);
fail_unless(ret == EOK, "sysdb_update_subdomains failed with [%d][%s]",
ret, strerror(ret));
@@ -5900,14 +5900,14 @@ START_TEST(test_sysdb_subdomain_user_ops)
subdomain = new_subdomain(test_ctx, test_ctx->domain,
testdom[0], testdom[1], testdom[2], testdom[3],
- false, false, NULL, NULL, 0);
+ false, false, NULL, NULL, 0, NULL);
fail_unless(subdomain != NULL, "Failed to create new subdomin.");
ret = sysdb_subdomain_store(test_ctx->sysdb,
testdom[0], testdom[1], testdom[2], testdom[3],
false, false, NULL, 0, NULL);
fail_if(ret != EOK, "Could not set up the test (test subdom)");
- ret = sysdb_update_subdomains(test_ctx->domain);
+ ret = sysdb_update_subdomains(test_ctx->domain, NULL);
fail_unless(ret == EOK, "sysdb_update_subdomains failed with [%d][%s]",
ret, strerror(ret));
@@ -5973,14 +5973,14 @@ START_TEST(test_sysdb_subdomain_group_ops)
subdomain = new_subdomain(test_ctx, test_ctx->domain,
testdom[0], testdom[1], testdom[2], testdom[3],
- false, false, NULL, NULL, 0);
+ false, false, NULL, NULL, 0, NULL);
fail_unless(subdomain != NULL, "Failed to create new subdomin.");
ret = sysdb_subdomain_store(test_ctx->sysdb,
testdom[0], testdom[1], testdom[2], testdom[3],
false, false, NULL, 0, NULL);
fail_if(ret != EOK, "Could not set up the test (test subdom)");
- ret = sysdb_update_subdomains(test_ctx->domain);
+ ret = sysdb_update_subdomains(test_ctx->domain, NULL);
fail_unless(ret == EOK, "sysdb_update_subdomains failed with [%d][%s]",
ret, strerror(ret));