Fix -s socket option, and document it as well.

Closes issue #11645, patch by Laureano.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95070 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/doc/asterisk.8 b/doc/asterisk.8
index 9e0e6880fad61a1f873b7acafefed58a1978e7f7..876721a9331d766ac166158a70f551f5a147068e 100644 (file)
--- a/doc/asterisk.8
+++ b/doc/asterisk.8
@@ -12,7 +12,7 @@ asterisk \- All-purpose telephony server.
 \fBasterisk\fR [ \fB-tThfdvVqpRgciIn\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ]
 
 
-\fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ]
+\fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-s \fIsocket\fB\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -117,6 +117,10 @@ to a running Asterisk process and provide a console interface
 for controlling it. Additionally, if connection to the Asterisk 
 process is lost, attempt to reconnect for as long as 30 seconds.
 .TP
+\fB-s \fIsocket\fB\fR
+Allows to specify the socket file to be used to connect to the
+Asterisk console. Used in conjunction with \fB-r\fR or \fB-R\fR.
+.TP
 \fB-I\fR
 Enable internal timing if Zaptel timer is available
 The default behaviour is that outbound packets are phase locked

diff --git a/main/asterisk.c b/main/asterisk.c
index ea464b76ab21eace36cdfacdc02b6abe4e277d3e..3e1ecad4364f5bcbc8ec2bd9ddd11df49d0b7bac 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2851,7 +2851,7 @@ int main(int argc, char *argv[])
        ast_readconfig();
 
        if (ast_opt_remote && remotesock != NULL)
-               ast_copy_string((char *) ast_config_AST_SOCKET, remotesock, sizeof(ast_config_AST_SOCKET));
+               ast_copy_string((char *) cfg_paths.socket_path, remotesock, sizeof(cfg_paths.socket_path));
 
        if (!ast_language_is_prefix && !ast_opt_remote)
                ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n");