kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't return -1 for successful conf in meetme. Bug #824

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2004-01-13 04:42:39 +00:00
parent b9d9f86770
commit b1488a63ef
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/app_meetme.c
View File

@@ -707,21 +707,25 @@ static int conf_exec(struct ast_channel *chan, void *data)
/* Prompt user for pin if pin is required */ /* Prompt user for pin if pin is required */
res = ast_app_getdata(chan, "conf-getpin", pin, sizeof(pin) - 1, 0); res = ast_app_getdata(chan, "conf-getpin", pin, sizeof(pin) - 1, 0);
} }
if (res == 0) { if (res >= 0) {
if (!strcasecmp(pin, cnf->pin)) { if (!strcasecmp(pin, cnf->pin)) {
/* Pin correct */ /* Pin correct */
allowretry = 0; allowretry = 0;
/* Run the conference */ /* Run the conference */
res = conf_run(chan, cnf, confflags); 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 { } else {
/* No pin required */ /* No pin required */
allowretry = 0; allowretry = 0;