Ensure global types in the config framework are initialized

If a config object was allocated but one of its global objects was
never encountered, then the global object's defaults were never
applied. Ensure that global objects are initialized properly upon
allocation instead of on configuration.

Review: https://reviewboard.asterisk.org/r/2866/
........

Merged revisions 399564 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 399565 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399566 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/config_options.c b/main/config_options.c
index 83b34028bc814b47947a4ffff0c60ec99cf8a147..2733d5c62f68aafdf82c41c1672872d475b1444e 100644 (file)
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -478,10 +478,6 @@ static int process_category(struct ast_config *cfg, struct aco_info *info, struc
        }
 
        if (type->type == ACO_GLOBAL && *field) {
-               if (aco_set_defaults(type, cat, *field)) {
-                       ast_log(LOG_ERROR, "In %s: Setting defaults for %s failed\n", file->filename, cat);
-                       return -1;
-               }
                if (aco_process_category_options(type, cfg, cat, *field)) {
                        ast_log(LOG_ERROR, "In %s: Processing options for %s failed\n", file->filename, cat);
                        return -1;
@@ -613,6 +609,27 @@ enum aco_process_status aco_process_config(struct aco_info *info, int reload)
 
        while (res != ACO_PROCESS_ERROR && (file = info->files[file_count++])) {
                const char *filename = file->filename;
+               struct aco_type *match;
+               int i;
+
+               /* set defaults for global objects */
+               for (i = 0, match = file->types[i]; match; match = file->types[++i]) {
+                       void **field = info->internal->pending + match->item_offset;
+
+                       if (match->type != ACO_GLOBAL || !*field) {
+                               continue;
+                       }
+
+                       if (aco_set_defaults(match, match->category, *field)) {
+                               ast_log(LOG_ERROR, "In %s: Setting defaults for %s failed\n", file->filename, match->category);
+                               res = ACO_PROCESS_ERROR;
+                               break;
+                       }
+               }
+
+               if (res == ACO_PROCESS_ERROR) {
+                       break;
+               }
 
 try_alias:
                cfg = ast_config_load(filename, cfg_flags);