diff options
| author | Ondrej Filip <feela@network.cz> | 2012-08-07 11:15:23 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2012-08-07 11:15:23 +0200 |
| commit | 60c412b9368fd7c3b0a8df2200f02140adcb0cf3 (patch) | |
| tree | 237d3c0b8aa86c6f3a88a76141ab51ca94b1fcd7 /conf/conf.c | |
| parent | 3fe1d9e4a40663b93b59f5b6f9d61af9dc6a8ae6 (diff) | |
| parent | 94e2f1c111721d6213ea65cac5c53036e38e3973 (diff) | |
Merge branch 'master' of ssh://git.nic.cz/birdv1.3.8
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); } |