diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-18 19:29:33 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-18 19:29:33 +0200 |
| commit | 4be266a9831799dcc2e67e83fc83d9db43828a64 (patch) | |
| tree | 13e880c5b078b851ba51688ed416c6dab3754545 /conf/conf.c | |
| parent | abced4a91495e27fe86b142bc1967cec53bab3dc (diff) | |
Implements wildcard matching in config file include.
Also fixes some minor bugs in include.
Thanks Kelly Cochran for suggestion and draft patch.
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 13049be4..9375861f 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -357,8 +357,8 @@ cf_error(char *msg, ...) if (bvsnprintf(buf, sizeof(buf), msg, args) < 0) strcpy(buf, "<bug: error message too long>"); new_config->err_msg = cfg_strdup(buf); - new_config->err_lino = ifs->conf_lino; - new_config->err_file_name = ifs->conf_fname; + new_config->err_lino = ifs->lino; + new_config->err_file_name = ifs->file_name; longjmp(conf_jmpbuf, 1); } |