diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-29 22:55:13 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-29 22:55:13 +0000 |
| commit | 7bbf90ab42ce760026ebd4bb41c7ca45d42dd11f (patch) | |
| tree | ebfefb8f1ec3ed367179f8cd7bad8a05b9817268 | |
| parent | aa4cca7df8a82e1fef2455b4a7dc85427de8fd65 (diff) | |
Merged revisions 114866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r114866 | jpeeler | 2008-04-29 17:54:14 -0500 (Tue, 29 Apr 2008) | 2 lines
Fixes a problem where all the templates were marked as dead no matter what. The templates should only be marked as dead if a configuration file has been successfully loaded and has changes. Bug found while making API documentation for 1.6.0.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114867 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/iax2-provision.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index 5b52a0934..c34665dbe 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -491,14 +491,16 @@ int iax_provision_reload(int reload) struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; if (!provinit) iax_provision_init(); - /* Mark all as dead. No need for locking */ - cur = templates; - while(cur) { - cur->dead = 1; - cur = cur->next; - } + cfg = ast_config_load("iaxprov.conf", config_flags); if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED) { + /* Mark all as dead. No need for locking */ + cur = templates; + while(cur) { + cur->dead = 1; + cur = cur->next; + } + /* Load as appropriate */ cat = ast_category_browse(cfg, NULL); while(cat) { |