From: Joshua Colp <jcolp@digium.com>
Date: Fri, 2 Feb 2007 16:58:09 +0000 (+0000)
Subject: Pass the glob expanded filename to process_text_line so that error messages contain... 
X-Git-Tag: 1.2.15~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15538c732c6095b2f62f12b25df01f9be99a8290;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.2@53117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/config.c b/config.c
index 989cd0b15b..75b3f6ee71 100644
--- a/config.c
+++ b/config.c
@@ -651,7 +651,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)) {
+						if (process_text_line(cfg, &cat, buf, lineno, fn)) {
 							cfg = NULL;
 							break;
 						}