Merged revisions 272259 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r272259 | pabelanger | 2010-06-23 17:06:15 -0400 (Wed, 23 Jun 2010) | 2 lines

  Fix previous merge. ast_test_flag != ast_test_flag64
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5fe842447150734ea7fa9b7fe1b521b568b886c4..26b6a50685faa3537e63e0f6ced09d6051f8d220 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3868,9 +3868,9 @@ static int conf_exec(struct ast_channel *chan, void *data)
                                }
                        } else {
                                if (((!ast_strlen_zero(cnf->pin) &&
-                                   !ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
+                                   !ast_test_flag64(&confflags, CONFFLAG_ADMIN)) ||
                                    (!ast_strlen_zero(cnf->pinadmin) &&
-                                   ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+                                   ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
                                    (!(cnf->users == 0 && cnf->isdynamic))) {
                                        char pin[MAX_PIN] = "";
                                        int j;