[Asterisk-cvs] asterisk/apps app_meetme.c,1.16,1.17

[jeremy at lists.digium.com]

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

Modified Files:
	app_meetme.c 
Log Message:
 Don't return -1 for successful conf in meetme. Bug #824


Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- app_meetme.c	12 Jan 2004 23:21:29 -0000	1.16
+++ app_meetme.c	13 Jan 2004 04:42:39 -0000	1.17
@@ -707,21 +707,25 @@
 						/* Prompt user for pin if pin is required */
 						res = ast_app_getdata(chan, "conf-getpin", pin, sizeof(pin) - 1, 0);
 					}
-					if (res == 0) {
+					if (res >= 0) {
 						if (!strcasecmp(pin, cnf->pin)) {
 							/* Pin correct */
 							allowretry = 0;
 							/* Run the conference */
 							res = conf_run(chan, cnf, confflags);
+						} else {
+							/* Pin invalid */
+							res = ast_streamfile(chan, "conf-invalidpin", chan->language);
+							if (!res)
+								ast_waitstream(chan, "");
+							res = -1;
+							if (allowretry)
+								strcpy(confno, "");
 						}
+					} else {
+						res = -1;
+						allowretry = 0;
 					}
-					/* Pin invalid or error */
-					res = ast_streamfile(chan, "conf-invalidpin", chan->language);
-					if (!res)
-						ast_waitstream(chan, "");
-					res = -1;
-					if (allowretry)
-						strcpy(confno, "");
 				} else {
 					/* No pin required */
 					allowretry = 0;