From ebbeac5c6b8b87ab478ee5a04ec48fbbba0c9efc Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 29 Jun 2016 16:18:12 +0200 Subject: SYSDB: Remove useless parameter from sysdb_init() The function sysdb_init() is never used to allow upgrade, so the allow_upgrade parameter was pointless. Reviewed-by: Sumit Bose --- src/db/sysdb.h | 3 +-- src/db/sysdb_init.c | 5 ++--- src/responder/common/responder_common.c | 2 +- src/tools/common/sss_tools.c | 2 +- src/tools/sss_cache.c | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/db/sysdb.h b/src/db/sysdb.h index cdd37d17c..b881310bf 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -613,8 +613,7 @@ uint64_t sss_view_ldb_msg_find_attr_as_uint64(struct sss_domain_info *dom, * call this function *only* once to initialize the database and get * the sysdb ctx */ int sysdb_init(TALLOC_CTX *mem_ctx, - struct sss_domain_info *domains, - bool allow_upgrade); + struct sss_domain_info *domains); /* Same as sysdb_init, but additionally allows to change * file ownership of the sysdb databases. */ diff --git a/src/db/sysdb_init.c b/src/db/sysdb_init.c index c6e9c4ac1..7298c2b18 100644 --- a/src/db/sysdb_init.c +++ b/src/db/sysdb_init.c @@ -840,10 +840,9 @@ done: } int sysdb_init(TALLOC_CTX *mem_ctx, - struct sss_domain_info *domains, - bool allow_upgrade) + struct sss_domain_info *domains) { - return sysdb_init_ext(mem_ctx, domains, allow_upgrade, false, 0, 0); + return sysdb_init_ext(mem_ctx, domains, false, false, 0, 0); } int sysdb_init_ext(TALLOC_CTX *mem_ctx, diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c index f519b8488..02a64368c 100644 --- a/src/responder/common/responder_common.c +++ b/src/responder/common/responder_common.c @@ -1047,7 +1047,7 @@ int sss_process_init(TALLOC_CTX *mem_ctx, } } - ret = sysdb_init(rctx, rctx->domains, false); + ret = sysdb_init(rctx, rctx->domains); if (ret != EOK) { SYSDB_VERSION_ERROR_DAEMON(ret); DEBUG(SSSDBG_FATAL_FAILURE, diff --git a/src/tools/common/sss_tools.c b/src/tools/common/sss_tools.c index ca90fe7e8..a78a5ba19 100644 --- a/src/tools/common/sss_tools.c +++ b/src/tools/common/sss_tools.c @@ -135,7 +135,7 @@ static errno_t sss_tool_domains_init(TALLOC_CTX *mem_ctx, return ret; } - ret = sysdb_init(mem_ctx, domains, false); + ret = sysdb_init(mem_ctx, domains); SYSDB_VERSION_ERROR(ret); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c index 8b1e82db1..8b78b29f1 100644 --- a/src/tools/sss_cache.c +++ b/src/tools/sss_cache.c @@ -622,7 +622,7 @@ static errno_t init_domains(struct cache_tool_ctx *ctx, return ret; } - ret = sysdb_init(ctx, ctx->domains, false); + ret = sysdb_init(ctx, ctx->domains); SYSDB_VERSION_ERROR(ret); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, -- cgit