diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-11 22:55:16 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-11 22:55:16 +0000 |
| commit | d02f74ebfe5354833d304c47c77849dcfd604cfe (patch) | |
| tree | 044b5e038aebbcadb348b2b79dc47b6fea73339e /res/res_config_ldap.c | |
| parent | c89a4be6e7764e69458181da254454832221e92d (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@107791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_config_ldap.c')
| -rw-r--r-- | res/res_config_ldap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 56f95ac01..b76ad8ae7 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -1006,7 +1006,7 @@ static int compare_categories(const void *a, const void *b) * called on a reload */ static struct ast_config *config_ldap(const char *basedn, const char *table_name, - const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *sugg_incl) + const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *sugg_incl, const char *who_asked) { unsigned int vars_count = 0; struct ast_variable **vars; @@ -1088,7 +1088,7 @@ static struct ast_config *config_ldap(const char *basedn, const char *table_name for (i = 0; i < vars_count; i++) { if (!strcmp(categories[i].variable_name, "#include")) { struct ast_flags config_flags = { 0 }; - if (!ast_config_internal_load(categories[i].variable_value, cfg, config_flags, "")) + if (!ast_config_internal_load(categories[i].variable_value, cfg, config_flags, "", who_asked)) break; continue; } |