diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-02-20 06:14:08 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-02-20 06:14:08 -0600 |
| commit | fd353237f0fe9d1793c4613d69180185d20cb738 (patch) | |
| tree | a185d87e7460cfeaeba99dcdec5f454384cc7852 /main | |
| parent | c1d523c7b38d042f4bf20f955c3a12edf35efdbb (diff) | |
| parent | e03f0f9572a4cdd53baa2b1667467fa74e972af0 (diff) | |
Merge "config: Fix locking for extconfig reload."
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c index 3fbbacf74..118b9586e 100644 --- a/main/config.c +++ b/main/config.c @@ -2839,8 +2839,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; @@ -2894,6 +2892,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(); |