summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-10-07 13:02:08 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-10-10 13:49:43 +0200
commit5ecc36322d9ccc9a9266263fcea8598ca89f4426 (patch)
treec0ad31d0fba434ea5f18afc223142fe3dbcdeb53 /src
parentd66d15bf97bfaf4b851e96717caeeef8581d5777 (diff)
downloadsssd-5ecc36322d9ccc9a9266263fcea8598ca89f4426.tar.gz
sssd-5ecc36322d9ccc9a9266263fcea8598ca89f4426.tar.xz
sssd-5ecc36322d9ccc9a9266263fcea8598ca89f4426.zip
MONITOR: Remove useless memory contexts
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/monitor/monitor.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 46b630c25..624e45026 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -154,9 +154,7 @@ struct config_file_ctx {
struct mt_ctx {
struct tevent_context *ev;
struct confdb_ctx *cdb;
- TALLOC_CTX *domain_ctx; /* Memory context for domain list */
struct sss_domain_info *domains;
- TALLOC_CTX *service_ctx; /* Memory context for services */
char **services;
int num_services;
int started_services;
@@ -929,11 +927,7 @@ static int get_monitor_config(struct mt_ctx *ctx)
ctx->service_id_timeout = timeout_seconds * 1000; /* service_id_timeout is in ms */
- ctx->service_ctx = talloc_new(ctx);
- if(!ctx->service_ctx) {
- return ENOMEM;
- }
- ret = confdb_get_string_as_list(ctx->cdb, ctx->service_ctx,
+ ret = confdb_get_string_as_list(ctx->cdb, ctx,
CONFDB_MONITOR_CONF_ENTRY,
CONFDB_MONITOR_ACTIVE_SERVICES,
&ctx->services);
@@ -942,7 +936,7 @@ static int get_monitor_config(struct mt_ctx *ctx)
return EINVAL;
}
- ret = add_implicit_services(ctx->cdb, ctx->service_ctx, &ctx->services);
+ ret = add_implicit_services(ctx->cdb, ctx, &ctx->services);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, "Failed to add implicit configured " \
"services. Some functionality might " \
@@ -961,10 +955,6 @@ static int get_monitor_config(struct mt_ctx *ctx)
ctx->num_services++;
}
- ctx->domain_ctx = talloc_new(ctx);
- if(!ctx->domain_ctx) {
- return ENOMEM;
- }
ret = confdb_get_domains(ctx->cdb, &ctx->domains);
if (ret != EOK) {
DEBUG(SSSDBG_FATAL_FAILURE, "No domains configured.\n");