Index: apps/app_meetme.c =================================================================== RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v retrieving revision 1.16 diff -u -r1.16 app_meetme.c --- apps/app_meetme.c 12 Jan 2004 23:21:29 -0000 1.16 +++ apps/app_meetme.c 13 Jan 2004 04:36:16 -0000 @@ -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;