From 5728684478066cc75406edf36c665cb5cb97dfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Tue, 3 Sep 2013 12:34:07 +0200 Subject: [PATCH 7/8] simple access test: initialize be_ctx for all tests Recent simple access provider patches started using be_ctx during access check. This caused segfault in unit tests, since be_ctx wasn't initialized. Resolves: https://fedorahosted.org/sssd/ticket/2034 --- src/tests/simple_access-tests.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/tests/simple_access-tests.c b/src/tests/simple_access-tests.c index a7a7e276de8d90a7bb0f375dc1fc3d1ac8d5ed7c..aaf7578715430306b04dcb3a53889fe550a977ee 100644 --- a/src/tests/simple_access-tests.c +++ b/src/tests/simple_access-tests.c @@ -127,6 +127,21 @@ void setup_simple(void) test_ctx->sysdb = test_ctx->ctx->domain->sysdb; test_ctx->ctx->domain->case_sensitive = true; test_ctx->ctx->domain->mpg = false; /* Simulate an LDAP domain better */ + + /* be_ctx */ + test_ctx->be_ctx = talloc_zero(test_ctx, struct be_ctx); + fail_if(test_ctx->be_ctx == NULL, "Unable to setup be_ctx"); + + test_ctx->be_ctx->cdb = test_ctx->confdb; + test_ctx->be_ctx->ev = test_ctx->ev; + test_ctx->be_ctx->conf_path = "config/domain/LOCAL"; + test_ctx->be_ctx->domain = test_ctx->ctx->domain; + + test_ctx->ctx->be_ctx = test_ctx->be_ctx; + + ret = sss_names_init(test_ctx->ctx->domain, test_ctx->confdb, + "LOCAL", &test_ctx->be_ctx->domain->names); + fail_if(ret != EOK, "Unable to setup domain names (%d)", ret); } void teardown_simple(void) @@ -148,7 +163,7 @@ void setup_simple_group(void) * g1 and g2 respectively */ ret = sysdb_add_group(test_ctx->sysdb, test_ctx->ctx->domain, "pvt", 999, NULL, 0, 0); - fail_if(ret != EOK, "Could not add private group"); + fail_if(ret != EOK, "Could not add private group %s", strerror(ret)); ret = sysdb_store_user(test_ctx->sysdb, test_ctx->ctx->domain, "u1", NULL, 123, 999, "u1", "/home/u1", @@ -204,21 +219,7 @@ void teardown_simple_group(void) void setup_simple_init(void) { - errno_t ret; - setup_simple(); - - test_ctx->be_ctx = talloc_zero(test_ctx, struct be_ctx); - fail_if(test_ctx->be_ctx == NULL, "Unable to setup be_ctx"); - - test_ctx->be_ctx->cdb = test_ctx->confdb; - test_ctx->be_ctx->ev = test_ctx->ev; - test_ctx->be_ctx->conf_path = "config/domain/LOCAL"; - test_ctx->be_ctx->domain = test_ctx->ctx->domain; - - ret = sss_names_init(test_ctx->ctx->domain, test_ctx->confdb, - "LOCAL", &test_ctx->be_ctx->domain->names); - fail_if(ret != EOK, "Unable to setup domain names (%d)", ret); } void teardown_simple_init(void) -- 1.7.11.7