[svn-commits] rmudgett: trunk r339510 - in /trunk: ./ main/manager.c

Wed Oct 5 11:36:53 CDT 2011

Author: rmudgett
Date: Wed Oct  5 11:36:49 2011
New Revision: 339510

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339510
Log:
Merged revisions 339508 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339508 | rmudgett | 2011-10-05 11:35:02 -0500 (Wed, 05 Oct 2011) | 18 lines
  
  Merged revisions 339504,339506 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339504 | rmudgett | 2011-10-05 11:26:45 -0500 (Wed, 05 Oct 2011) | 7 lines
    
    Add missing documentation of required AMI action Challenge AuthType header.
    
    (closes issue ASTERISK-18554)
    Reported by: Vlad Povorozniuc
    Patches:
          __20110919-manager-challenge-docs.patch.txt (license #4999) patch uploaded by Leif Madsen
  ........
    r339506 | rmudgett | 2011-10-05 11:32:03 -0500 (Wed, 05 Oct 2011) | 1 line
    
    Fix XML error in AMI action Challenge.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=339510&r1=339509&r2=339510
==============================================================================

--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Oct  5 11:36:49 2011
@@ -156,6 +156,12 @@
 		</synopsis>
 		<syntax>
 			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<parameter name="AuthType" required="true">
+				<para>Digest algorithm to use in the challenge. Valid values are:</para>
+				<enumlist>
+					<enum name="MD5" />
+				</enumlist>
+			</parameter>
 		</syntax>
 		<description>
 			<para>Generate a challenge for MD5 authentication.</para>


