From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 23 Jun 2010 21:07:48 +0000 (+0000)
Subject: Merged revisions 272259 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41f445251d03162473202f6eaca6faf4921742f;p=thirdparty%2Fasterisk.git

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 5fe8424471..26b6a50685 100644
--- 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;