This patch fixes a bug with MeetMe behavior where the 'P' option for always

prompting for a pin is ignored for the first caller.

(closes issue #18070)
Reported by: mav3rick

Review: https://reviewboard.asterisk.org/r/1132/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311615 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index bb32135fc36d66401b490b99b2fd2382b1a06476..1a440af02af39cd37af45c7d3cc8293b13941bd1 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4316,11 +4316,12 @@ static int conf_exec(struct ast_channel *chan, const char *data)
                                if (((!ast_strlen_zero(cnf->pin)       &&
                                        !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
                                     (!ast_strlen_zero(cnf->pinadmin)  &&
-                                        ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
-                                    (!ast_strlen_zero(cnf->pin) &&
-                                        ast_strlen_zero(cnf->pinadmin) &&
-                                        ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
-                                   (!(cnf->users == 0 && cnf->isdynamic))) {
+                                                ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
+                                            (!ast_strlen_zero(cnf->pin) &&
+                                                        ast_strlen_zero(cnf->pinadmin) &&
+                                                        ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
+                                   ((!(cnf->users == 0 && cnf->isdynamic)) ||
+                                               ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT))) {
                                        char pin[MAX_PIN] = "";
                                        int j;