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

diff --git a/main/manager.c b/main/manager.c
index c4d1e1101468893f7e88cfc790d9f07d5f82fe55..4bcb65eace9ed59648a2ac4a5145fa78b838bfb6 100644 (file)
--- 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>