diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:07:48 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:07:48 +0000 |
| commit | 715995777c419492239e0001a66114331c117391 (patch) | |
| tree | 5e54a3ec3366636c3f02c52f811334fe3400e633 /apps | |
| parent | a665318c5d542c3da2dd54393f06b69626cc7e9e (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@272261 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 5fe842447..26b6a5068 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; |