[svn-commits] mvanbaak: branch group/appdocsxml r150929 - in /team/group/appdocsxml: ./ apps/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Oct 18 03:44:02 2008
New Revision: 150929

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150929
Log:
resolve, reset, go

Modified:
    team/group/appdocsxml/   (props changed)
    team/group/appdocsxml/CHANGES
    team/group/appdocsxml/apps/app_authenticate.c

Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Oct 18 03:44:02 2008
@@ -1,1 +1,1 @@
-/trunk:1-150822
+/trunk:1-150928

Modified: team/group/appdocsxml/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/CHANGES?view=diff&rev=150929&r1=150928&r2=150929
==============================================================================
--- team/group/appdocsxml/CHANGES (original)
+++ team/group/appdocsxml/CHANGES Sat Oct 18 03:44:02 2008
@@ -28,6 +28,8 @@
 ------------
  * Scheduled meetme conferences may now have their end times extended by
    using MeetMeAdmin.
+ * app_authenticate now gives the ability to select a prompt other than
+   the default.
 
 Miscellaneous
 -------------

Modified: team/group/appdocsxml/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/apps/app_authenticate.c?view=diff&rev=150929&r1=150928&r2=150929
==============================================================================
--- team/group/appdocsxml/apps/app_authenticate.c (original)
+++ team/group/appdocsxml/apps/app_authenticate.c Sat Oct 18 03:44:02 2008
@@ -86,6 +86,9 @@
 				<para>maximum acceptable number of digits. Stops reading after
 				maxdigits have been entered (without requiring the user to press the <literal>#</literal> key).
 				Defaults to 0 - no limit - wait for the user press the <literal>#</literal> key.</para>
+			</parameter>
+			<parameter name="prompt" required="false>
+				<para>Override the agent-pass prompt file.</para>
 			</parameter>
 		</syntax>
 		<description>
@@ -108,6 +111,7 @@
 		AST_APP_ARG(password);
 		AST_APP_ARG(options);
 		AST_APP_ARG(maxdigits);
+		AST_APP_ARG(prompt);
 	);
 
 	if (ast_strlen_zero(data)) {
@@ -135,6 +139,12 @@
 		maxdigits = sizeof(passwd) - 2;
 	}
 
+	if (!ast_strlen_zero(arglist.prompt)) {
+		prompt = arglist.prompt;
+	} else {
+		prompt = "agent-pass";
+	}
+   
 	/* Start asking for password */
 	for (retries = 0; retries < 3; retries++) {
 		if ((res = ast_app_getdata(chan, prompt, passwd, maxdigits, 0)) < 0)