diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-14 10:31:40 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-14 10:31:40 -0600 |
| commit | a6d2926e5dc1c8216ee207c1f11460587a6abe93 (patch) | |
| tree | 0e3d1b0d75faa1d0825ca3fef61cbed28728d507 | |
| parent | 69d12bcf3e313801446254f394b66abc127f603f (diff) | |
| parent | cdaaa14a5fc2bdc7e5e1a12fdde238e93ea4beba (diff) | |
Merge "core: Fix configuration of remote console socket path."
| -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 371c1a34f..77046f272 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3650,7 +3650,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)); @@ -3659,6 +3658,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")) { |