diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-11-14 10:19:21 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-14 10:19:21 -0600 |
| commit | d74b50ecf79c685502a8338701467a1f2a5768f7 (patch) | |
| tree | 444b27a012887c721de539a467fd7bd8079a15f3 /main/asterisk.c | |
| parent | d7303f6337d75195b33306d5b9f8b936092e1fa8 (diff) | |
| parent | 9c6d4ec022a45cadb9202b561a4dee5def5c49a5 (diff) | |
Merge "core: Fix configuration of remote console socket path." into 13
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 0eaf8dd02..964fa254d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3773,7 +3773,6 @@ static void ast_readconfig(void) ast_copy_string(cfg_paths.agi_dir, v->value, sizeof(cfg_paths.agi_dir)); } else if (!strcasecmp(v->name, "astrundir")) { snprintf(cfg_paths.pid_path, sizeof(cfg_paths.pid_path), "%s/%s", v->value, "asterisk.pid"); - snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s", v->value, ast_config_AST_CTL); ast_copy_string(cfg_paths.run_dir, v->value, sizeof(cfg_paths.run_dir)); } else if (!strcasecmp(v->name, "astmoddir")) { ast_copy_string(cfg_paths.module_dir, v->value, sizeof(cfg_paths.module_dir)); @@ -3782,6 +3781,10 @@ static void ast_readconfig(void) } } + /* Combine astrundir and astctl settings. */ + snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s", + ast_config_AST_RUN_DIR, ast_config_AST_CTL); + for (v = ast_variable_browse(cfg, "options"); v; v = v->next) { /* verbose level (-v at startup) */ if (!strcasecmp(v->name, "verbose")) { |