diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-17 18:52:33 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-17 18:52:33 +0000 |
| commit | 9955c4a93170ad8e759a37bb85ce593f5a613d49 (patch) | |
| tree | f56a03a3352be6cbf6fde307082529ae5e4a5a32 /main | |
| parent | b6350c90aaa1f8c28ebcbd6b73f99d9b4de606b2 (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: http://svn.digium.com/svn/asterisk/trunk@324179 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 6 |
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> |