From 2bffccf990b08fb8ce1c72a0a5092053c8a06e12 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Wed, 22 Jul 2015 14:21:52 +0200 Subject: negcache: allow domain name for UID and GID Related to https://fedorahosted.org/sssd/ticket/2731 --- src/tests/cmocka/test_negcache.c | 40 ++++++++++++++--------------- src/tests/cmocka/test_nss_srv.c | 8 +++--- src/tests/cmocka/test_responder_cache_req.c | 4 +-- 3 files changed, 27 insertions(+), 25 deletions(-) (limited to 'src/tests') diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c index fa07ea248..a1f947185 100644 --- a/src/tests/cmocka/test_negcache.c +++ b/src/tests/cmocka/test_negcache.c @@ -188,7 +188,7 @@ static void test_sss_ncache_uid(void **state) ts = talloc_get_type_abort(*state, struct test_state); /* test when uid not present in database */ - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, ENOENT); /* test when uid is present in database */ @@ -197,43 +197,43 @@ static void test_sss_ncache_uid(void **state) ret = sss_ncache_reset_permanent(ts->ctx); assert_int_equal(ret, EOK); - ret = sss_ncache_set_uid(ts->ctx, permanent, uid); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, uid); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, EEXIST); ttl = SHORTSPAN; - ret = sss_ncache_set_uid(ts->ctx, permanent, uid); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, uid); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, EEXIST); sleep(SHORTSPAN + 1); - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, EEXIST); permanent = false; - ret = sss_ncache_set_uid(ts->ctx, permanent, uid); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, uid); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, EEXIST); sleep(SHORTSPAN + 1); - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, ENOENT); - ret = sss_ncache_set_uid(ts->ctx, permanent, uid); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, uid); assert_int_equal(ret, EOK); /* test when ttl is -1 with uid present in database*/ ttl = -1; - ret = sss_ncache_check_uid(ts->ctx, ttl, uid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, uid); assert_int_equal(ret, EEXIST); } @@ -253,27 +253,27 @@ static void test_sss_ncache_gid(void **state) ts = talloc_get_type_abort(*state, struct test_state); /* test when gid is not present in database */ - ret = sss_ncache_check_gid(ts->ctx, ttl, gid); + ret = sss_ncache_check_gid(ts->ctx, ttl, NULL, gid); assert_int_equal(ret, ENOENT); /* test when gid is present in database */ permanent = true; - ret = sss_ncache_set_gid(ts->ctx, permanent, gid); + ret = sss_ncache_set_gid(ts->ctx, permanent, NULL, gid); assert_int_equal(ret, EOK); - ret = sss_ncache_check_gid(ts->ctx, ttl, gid); + ret = sss_ncache_check_gid(ts->ctx, ttl, NULL, gid); assert_int_equal(ret, EEXIST); permanent = false; - ret = sss_ncache_set_uid(ts->ctx, permanent, gid); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, gid); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, ttl, gid); + ret = sss_ncache_check_uid(ts->ctx, ttl, NULL, gid); assert_int_equal(ret, EEXIST); /* test when ttl is -1 with gid present in database*/ ttl = -1; - ret = sss_ncache_check_gid(ts->ctx, ttl, gid); + ret = sss_ncache_check_gid(ts->ctx, ttl, NULL, gid); assert_int_equal(ret, EEXIST); } @@ -608,16 +608,16 @@ static void test_sss_ncache_reset_permanent(void **state) ts = talloc_get_type_abort(*state, struct test_state); - ret = sss_ncache_set_uid(ts->ctx, permanent, 0); + ret = sss_ncache_set_uid(ts->ctx, permanent, NULL, 0); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, 0, 0); + ret = sss_ncache_check_uid(ts->ctx, 0, NULL, 0); assert_int_equal(ret, EEXIST); ret = sss_ncache_reset_permanent(ts->ctx); assert_int_equal(ret, EOK); - ret = sss_ncache_check_uid(ts->ctx, 0, 0); + ret = sss_ncache_check_uid(ts->ctx, 0, NULL, 0); assert_int_equal(ret, ENOENT); } diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c index 84d3413be..2d4fb2204 100644 --- a/src/tests/cmocka/test_nss_srv.c +++ b/src/tests/cmocka/test_nss_srv.c @@ -166,13 +166,15 @@ int __wrap_sss_ncache_check_user(struct sss_nc_ctx *ctx, int ttl, return ret; } -int __real_sss_ncache_check_uid(struct sss_nc_ctx *ctx, int ttl, uid_t uid); +int __real_sss_ncache_check_uid(struct sss_nc_ctx *ctx, int ttl, + struct sss_domain_info *dom, uid_t uid); -int __wrap_sss_ncache_check_uid(struct sss_nc_ctx *ctx, int ttl, uid_t uid) +int __wrap_sss_ncache_check_uid(struct sss_nc_ctx *ctx, int ttl, + struct sss_domain_info *dom, uid_t uid) { int ret; - ret = __real_sss_ncache_check_uid(ctx, ttl, uid); + ret = __real_sss_ncache_check_uid(ctx, ttl, dom, uid); if (ret == EEXIST) { nss_test_ctx->ncache_hits++; } diff --git a/src/tests/cmocka/test_responder_cache_req.c b/src/tests/cmocka/test_responder_cache_req.c index 31b669466..032fe429a 100644 --- a/src/tests/cmocka/test_responder_cache_req.c +++ b/src/tests/cmocka/test_responder_cache_req.c @@ -873,7 +873,7 @@ void test_user_by_id_ncache(void **state) test_ctx = talloc_get_type_abort(*state, struct cache_req_test_ctx); - ret = sss_ncache_set_uid(test_ctx->ncache, false, uid); + ret = sss_ncache_set_uid(test_ctx->ncache, false, NULL, uid); assert_int_equal(ret, EOK); req_mem_ctx = talloc_new(global_talloc_context); @@ -1601,7 +1601,7 @@ void test_group_by_id_ncache(void **state) test_ctx = talloc_get_type_abort(*state, struct cache_req_test_ctx); - ret = sss_ncache_set_gid(test_ctx->ncache, false, gid); + ret = sss_ncache_set_gid(test_ctx->ncache, false, NULL, gid); assert_int_equal(ret, EOK); req_mem_ctx = talloc_new(global_talloc_context); -- cgit