summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLeif Madsen <leif@leifmadsen.com>2011-06-17 18:52:33 +0000
committerLeif Madsen <leif@leifmadsen.com>2011-06-17 18:52:33 +0000
commit3d6c1ccd912ba21de963e820d392a697db2cfa42 (patch)
treef56a03a3352be6cbf6fde307082529ae5e4a5a32 /main
parenta5770c43f0fcf1cc3b52ddc58de91c08bcb0df30 (diff)
Merged revisions 324178 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r324178 | lmadsen | 2011-06-17 14:51:16 -0400 (Fri, 17 Jun 2011) | 2 lines Add Username and Secret fields to manager Login action. Pointed out by Vlad Povorozniuc ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c
index c4d1e1101..4bcb65eac 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -134,6 +134,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="ActionID">
<para>ActionID for this transaction. Will be returned.</para>
</parameter>
+ <parameter name="Username" required="true">
+ <para>Username to login with as specified in manager.conf.</para>
+ </parameter>
+ <parameter name="Secret">
+ <para>Secret to login with as specified in manager.conf.</para>
+ </parameter>
</syntax>
<description>
<para>Login Manager.</para>