Merged revisions 311615 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311615 | bbryant | 2011-03-23 17:54:11 -0400 (Wed, 23 Mar 2011) | 8 lines

  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/trunk@311616 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 50090dd5707256dd89e1b108ffa1e1caf2ae03a9..1d30b2ca7956137f4065aa1bc05fca645ba4e4d2 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4400,11 +4400,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;