config: Fix locking for extconfig reload.

Expand locking to include full reload process for extconfig to ensure
nothing can read the config mappings between clearing and reloading.

Change-Id: I378316bad04f1b599ea82d0fef62b8978a644b92

diff --git a/main/config.c b/main/config.c
index d022b6a7d58c230ffb5e3471293341c4be25fdf9..3b56c03870c7bc389266ae414009a852f7993b42 100644 (file)
--- a/main/config.c
+++ b/main/config.c
@@ -2841,8 +2841,6 @@ static void clear_config_maps(void)
 {
        struct ast_config_map *map;
 
-       SCOPED_MUTEX(lock, &config_lock);
-
        while (config_maps) {
                map = config_maps;
                config_maps = config_maps->next;
@@ -2896,6 +2894,7 @@ int read_config_maps(void)
        char *driver, *table, *database, *textpri, *stringp, *tmp;
        struct ast_flags flags = { CONFIG_FLAG_NOREALTIME };
        int pri;
+       SCOPED_MUTEX(lock, &config_lock);
 
        clear_config_maps();