From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 23 Jun 2010 21:06:15 +0000 (+0000)
Subject: Fix previous merge. ast_test_flag != ast_test_flag64
X-Git-Tag: 11.0.0-beta1~2781
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c850b5b14eebdee1e9f9779abe6c059df78ade;p=thirdparty%2Fasterisk.git

Fix previous merge. ast_test_flag != ast_test_flag64


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8b24b3c5c1..1ad67690b7 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4141,9 +4141,9 @@ static int conf_exec(struct ast_channel *chan, const char *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;