diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 22:59:52 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 22:59:52 +0000 |
| commit | 0e5f2c53d5af62612ed3854bbddef3f4e0f610ba (patch) | |
| tree | 1cea9d348c9d8281165f520d87ba814b8c8f0acd /res/res_config_odbc.c | |
| parent | 043abc066156be7ff5deaa814b0ef7a84125e82f (diff) | |
Merged revisions 107791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r107791 | tilghman | 2008-03-11 17:55:16 -0500 (Tue, 11 Mar 2008) | 5 lines
An offhand comment from Russell made me realize that the configuration file
caching would not work properly for users.conf and any other file read from
more than one place. I needed to add the filename which requested the config
file to get it to work properly.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107793 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_odbc.c')
| -rw-r--r-- | res/res_config_odbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 57b1ba528..8a28ddec8 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -625,7 +625,7 @@ static SQLHSTMT config_odbc_prepare(struct odbc_obj *obj, void *data) return sth; } -static struct ast_config *config_odbc(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags, const char *sugg_incl) +static struct ast_config *config_odbc(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags, const char *sugg_incl, const char *who_asked) { struct ast_variable *new_v; struct ast_category *cur_cat; @@ -682,7 +682,7 @@ static struct ast_config *config_odbc(const char *database, const char *table, c while ((res = SQLFetch(stmt)) != SQL_NO_DATA) { if (!strcmp (q.var_name, "#include")) { - if (!ast_config_internal_load(q.var_val, cfg, loader_flags, "")) { + if (!ast_config_internal_load(q.var_val, cfg, loader_flags, "", who_asked)) { SQLFreeHandle(SQL_HANDLE_STMT, stmt); ast_odbc_release_obj(obj); return NULL; |