diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-02 17:01:04 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-02 17:01:04 +0000 |
| commit | 0dcca6fb8e54c95dc7d667df0d939352e27fce84 (patch) | |
| tree | 7f20838eeb3c1f7011a0dabef70d8efc65f1d089 /main | |
| parent | b93e1dcd3f21635f4438dda92d5d6dc37a6f6f10 (diff) | |
Merged revisions 53118 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r53118 | file | 2007-02-02 10:59:53 -0600 (Fri, 02 Feb 2007) | 10 lines
Merged revisions 53117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53117 | file | 2007-02-02 10:58:09 -0600 (Fri, 02 Feb 2007) | 2 lines
Pass the glob expanded filename to process_text_line so that error messages contain the actual filename, not the original include one. (issue #8959 reported by tzafrir)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53119 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/config.c b/main/config.c index 7626af997..9889e639e 100644 --- a/main/config.c +++ b/main/config.c @@ -923,7 +923,7 @@ static struct ast_config *config_text_file_load(const char *database, const char if (process_buf) { char *buf = ast_strip(process_buf); if (!ast_strlen_zero(buf)) { - if (process_text_line(cfg, &cat, buf, lineno, filename, withcomments)) { + if (process_text_line(cfg, &cat, buf, lineno, fn, withcomments)) { cfg = NULL; break; } |