From 6a674402ea6c871dbb164a7c180d67f078d7fc2f Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 5 Feb 2013 11:45:33 +0100 Subject: [PATCH] conf: perform aftercheck on ctx-copy Afterchecks should be always performed when reading data into a config context. So perform them after copy operations, too. Signed-off-by: David Herrmann --- src/conf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf.c b/src/conf.c index ef65eed..cb4e6bf 100644 --- a/src/conf.c +++ b/src/conf.c @@ -123,7 +123,7 @@ void *conf_ctx_get_mem(struct conf_ctx *ctx) int conf_ctx_parse_ctx(struct conf_ctx *ctx, const struct conf_ctx *src) { unsigned int i; - struct conf_option *d, *s; + struct conf_option *d, *s, *o; int ret; if (!ctx || !src) @@ -154,6 +154,15 @@ int conf_ctx_parse_ctx(struct conf_ctx *ctx, const struct conf_ctx *src) } } + for (i = 0; i < ctx->onum; ++i) { + o = &ctx->opts[i]; + if (o->aftercheck) { + ret = o->aftercheck(o, 0, NULL, 0); + if (ret < 0) + return ret; + } + } + return 0; }