[Asterisk-cvs] asterisk/apps app_meetme.c,1.78,1.79

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv27775/apps

Modified Files:
	app_meetme.c 
Log Message:
Add option to prompt for PIN even if specified (bug #3489)


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- app_meetme.c	2 Feb 2005 02:20:34 -0000	1.78
+++ app_meetme.c	2 Feb 2005 02:57:45 -0000	1.79
@@ -84,7 +84,8 @@
 "        (Note: This does not work with non-Zap channels in the same conference)\n"
 "      's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
 "      'a' -- set admin mode\n"
-"      'A' -- set marked mode\n";
+"      'A' -- set marked mode\n"
+"      'P' -- always prompt for the pin even if it is specified\n";
 
 static char *descrip2 =
 "  MeetMeCount(confno[|var]): Plays back the number of users in the specifiedi\n"
@@ -1324,6 +1325,7 @@
 	int confflags = 0;
 	int dynamic = 0;
 	int empty = 0, empty_no_pin = 0;
+	int always_prompt = 0;
 	char *notdata, *info, *inflags = NULL, *inpin = NULL, the_pin[AST_MAX_EXTENSION] = "";
 
 	if (!data || ast_strlen_zero(data)) {
@@ -1397,6 +1399,8 @@
 			empty = 1;
 			empty_no_pin = 1;
 		}
+		if (strchr(inflags, 'P'))
+			always_prompt = 1;
 	}
 
 	do {
@@ -1529,7 +1533,7 @@
 
 					/* Allow the pin to be retried up to 3 times */
 					for (j=0; j<3; j++) {
-						if (*the_pin) {
+						if (*the_pin && (always_prompt==0)) {
 							strncpy(pin, the_pin, sizeof(pin) - 1);
 							res = 0;
 						} else {
@@ -1563,7 +1567,7 @@
 						}
 
 						/* Don't retry pin with a static pin */
-						if (*the_pin) {
+						if (*the_pin && (always_prompt==0)) {
 							break;
 						}
 					}