diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-08-30 18:04:41 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-08-30 18:04:41 +0000 |
| commit | dcaa0cf659550a1ef73216adb066fbd50b7295a7 (patch) | |
| tree | e310f41f59e44b5095ed368bdab5f9d857aa5d2b /main/udptl.c | |
| parent | af1747ee6c23359e9ac9b88d7821a1985899de60 (diff) | |
features_config: Don't require features.conf to be present for Asterisk to load
(closes issue ASTERISK-22426)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2806/
........
Merged revisions 398020 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/udptl.c')
| -rw-r--r-- | main/udptl.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/main/udptl.c b/main/udptl.c index d5d77388d..25a4cc02c 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1458,14 +1458,17 @@ static int removed_options_handler(const struct aco_option *opt, struct ast_vari static void __ast_udptl_reload(int reload) { - RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup); - if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) { if (!reload) { - if (!aco_set_defaults(&general_option, "general", udptl_cfg->general)) { - ast_log(LOG_WARNING, "Could not load udptl config; using defaults\n"); - ao2_global_obj_replace(globals, udptl_cfg); + RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup); + + if (aco_set_defaults(&general_option, "general", udptl_cfg->general)) { + ast_log(LOG_ERROR, "Failed to load udptl.conf and failed to initialize defaults.\n"); + return; } + + ast_log(LOG_NOTICE, "Could not load udptl config; using defaults\n"); + ao2_global_obj_replace(globals, udptl_cfg); } } } |