diff options
author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-25 23:37:50 +0200 |
---|---|---|
committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-05-25 23:37:50 +0200 |
commit | a1dc5267602062562f9adca7acfbbc2fee3b315e (patch) | |
tree | 8c9a6bbf78eedb116ee93c2437284c56083dac51 /conf/conf.c | |
parent | 4b2aef8857a9ac23015e410930d2162d945892f0 (diff) | |
parent | b7761af34dc4ed3f1bdf874eb85d743b931b0af6 (diff) |
Merge branch 'master' into int-new
Diffstat (limited to 'conf/conf.c')
-rw-r--r-- | conf/conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/conf.c b/conf/conf.c index 9978ef23..e8c0dc67 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -166,7 +166,7 @@ int cli_parse(struct config *c) { int done = 0; - c->sym_fallback = config->sym_hash; + c->fallback = config; new_config = c; cfg_mem = c->mem; if (setjmp(conf_jmpbuf)) @@ -177,7 +177,7 @@ cli_parse(struct config *c) done = 1; cleanup: - c->sym_fallback = NULL; + c->fallback = NULL; new_config = NULL; cfg_mem = NULL; return done; |