<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7211">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">core: Fix configuration of remote console socket path.<br><br>The remote console socket path is the combination of asterisk.conf<br>settings astrundir from [directories] and astctl from [files].<br>Unconditionally combine the two strings after processing all values<br>to ensure we end up with the correct socket path.<br><br>ASTERISK-27415<br><br>Change-Id: Ib1e2805d55d6b0955c6430a1a2a93acbf9b091e8<br>---<br>M main/asterisk.c<br>1 file changed, 4 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/asterisk.c b/main/asterisk.c<br>index 40986a4..2126487 100644<br>--- a/main/asterisk.c<br>+++ b/main/asterisk.c<br>@@ -3655,7 +3655,6 @@<br>                      ast_copy_string(cfg_paths.agi_dir, v->value, sizeof(cfg_paths.agi_dir));<br>           } else if (!strcasecmp(v->name, "astrundir")) {<br>                  snprintf(cfg_paths.pid_path, sizeof(cfg_paths.pid_path), "%s/%s", v->value, "asterisk.pid");<br>-                  snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s", v->value, ast_config_AST_CTL);<br>                   ast_copy_string(cfg_paths.run_dir, v->value, sizeof(cfg_paths.run_dir));<br>           } else if (!strcasecmp(v->name, "astmoddir")) {<br>                  ast_copy_string(cfg_paths.module_dir, v->value, sizeof(cfg_paths.module_dir));<br>@@ -3664,6 +3663,10 @@<br>             }<br>     }<br> <br>+ /* Combine astrundir and astctl settings. */<br>+ snprintf(cfg_paths.socket_path, sizeof(cfg_paths.socket_path), "%s/%s",<br>+            ast_config_AST_RUN_DIR, ast_config_AST_CTL);<br>+<br>       for (v = ast_variable_browse(cfg, "options"); v; v = v->next) {<br>          /* verbose level (-v at startup) */<br>           if (!strcasecmp(v->name, "verbose")) {<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7211">change 7211</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7211"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib1e2805d55d6b0955c6430a1a2a93acbf9b091e8 </div>
<div style="display:none"> Gerrit-Change-Number: 7211 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>