diff options
author | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-13 04:42:39 +0000 |
---|---|---|
committer | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-13 04:42:39 +0000 |
commit | 0e4dd867139d3fcd767fc72264037d5ff7a6267c (patch) | |
tree | 2fe0ff41d53d5224c892c30f9c3a36755eaadb15 /apps | |
parent | 6670b9b0eaa03253335c33dc9a12d9a67cae76c5 (diff) |
Don't return -1 for successful conf in meetme. Bug #824
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2005 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/app_meetme.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 580ebb5c3..9c4507b9b 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -707,21 +707,25 @@ static int conf_exec(struct ast_channel *chan, void *data) /* 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; |