diff options
| -rw-r--r-- | server/confdb/confdb.c | 1 | ||||
| -rw-r--r-- | server/confdb/confdb.h | 1 | ||||
| -rw-r--r-- | server/monitor/monitor.c | 2 | ||||
| -rw-r--r-- | server/tests/sysdb-tests.c | 2 | ||||
| -rw-r--r-- | server/tools/tools_util.c | 2 | ||||
| -rw-r--r-- | server/util/server.c | 4 |
6 files changed, 5 insertions, 7 deletions
diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c index 1ef2233a0..8fbae2f7a 100644 --- a/server/confdb/confdb.c +++ b/server/confdb/confdb.c @@ -627,7 +627,6 @@ done: } int confdb_init(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, struct confdb_ctx **cdb_ctx, char *confdb_location) { diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h index d325ac8fb..d49040fee 100644 --- a/server/confdb/confdb.h +++ b/server/confdb/confdb.h @@ -86,7 +86,6 @@ int confdb_get_string_as_list(struct confdb_ctx *cdb, TALLOC_CTX *ctx, char ***result); int confdb_init(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, struct confdb_ctx **cdb_ctx, char *confdb_location); diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c index 86b2364cf..cd4e3cebb 100644 --- a/server/monitor/monitor.c +++ b/server/monitor/monitor.c @@ -1811,7 +1811,7 @@ int monitor_process_init(TALLOC_CTX *mem_ctx, } unlink(cdb_file); - ret = confdb_init(ctx, ctx->ev, &ctx->cdb, cdb_file); + ret = confdb_init(ctx, &ctx->cdb, cdb_file); if (ret != EOK) { DEBUG(0,("The confdb initialization failed\n")); talloc_free(ctx); diff --git a/server/tests/sysdb-tests.c b/server/tests/sysdb-tests.c index 38bfcb10b..5250b0883 100644 --- a/server/tests/sysdb-tests.c +++ b/server/tests/sysdb-tests.c @@ -81,7 +81,7 @@ static int setup_sysdb_tests(struct sysdb_test_ctx **ctx) DEBUG(3, ("CONFDB: %s\n", conf_db)); /* Connect to the conf db */ - ret = confdb_init(test_ctx, test_ctx->ev, &test_ctx->confdb, conf_db); + ret = confdb_init(test_ctx, &test_ctx->confdb, conf_db); if (ret != EOK) { fail("Could not initialize connection to the confdb"); talloc_free(test_ctx); diff --git a/server/tools/tools_util.c b/server/tools/tools_util.c index c23899c8f..15ba16f00 100644 --- a/server/tools/tools_util.c +++ b/server/tools/tools_util.c @@ -76,7 +76,7 @@ int setup_db(struct tools_ctx **tools_ctx) } /* Connect to the conf db */ - ret = confdb_init(ctx, ctx->ev, &ctx->confdb, confdb_path); + ret = confdb_init(ctx, &ctx->confdb, confdb_path); if (ret != EOK) { DEBUG(1, ("Could not initialize connection to the confdb\n")); talloc_free(ctx); diff --git a/server/util/server.c b/server/util/server.c index d20a823c7..0760e60f2 100644 --- a/server/util/server.c +++ b/server/util/server.c @@ -47,7 +47,7 @@ static void close_low_fds(bool stderr_too) int i; close(0); - close(1); + close(1); if (stderr_too) close(2); @@ -354,7 +354,7 @@ int server_setup(const char *name, int flags, } DEBUG(3, ("CONFDB: %s\n", conf_db)); - ret = confdb_init(ctx, event_ctx, &ctx->confdb_ctx, conf_db); + ret = confdb_init(ctx, &ctx->confdb_ctx, conf_db); if (ret != EOK) { DEBUG(0,("The confdb initialization failed\n")); return ret; |