norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conf: fix overwriting locked options during copy

Browse Source 
If we copy entries into another context, we must not overwrite locked
entries. Furthermore, if we copy a locked entry, we must also copy that
lock.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-10-19 16:19:26 +02:00
parent 06c6e56d4c
commit 78cf66f087
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf.c
View File

@ -135,6 +135,12 @@ int conf_ctx_parse_ctx(struct conf_ctx *ctx, const struct conf_ctx *src)
if (d->type != s->type)
continue;
if (d->flags & CONF_LOCKED)
continue;
if (s->flags & CONF_LOCKED)
d->flags |= CONF_LOCKED;
if (!d->type->copy)
continue;