From 3d6c1ccd912ba21de963e820d392a697db2cfa42 Mon Sep 17 00:00:00 2001
From: Leif Madsen <leif@leifmadsen.com>
Date: Fri, 17 Jun 2011 18:52:33 +0000
Subject: [PATCH] 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
---
 main/manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main/manager.c b/main/manager.c
index c4d1e11014..4bcb65eace 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>