ensure that 'Events: On' enables all event types (issue #5016)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
8084c8d9d7
commit
601e4bb78a
16
manager.c
16
manager.c
|
@ -395,19 +395,21 @@ static int ast_is_number(char *string)
|
|||
|
||||
static int ast_strings_to_mask(char *string)
|
||||
{
|
||||
int x = 0, ret = -1;
|
||||
int x, ret = -1;
|
||||
|
||||
x = ast_is_number(string);
|
||||
|
||||
if (x)
|
||||
if (x) {
|
||||
ret = x;
|
||||
else if (!string || ast_strlen_zero(string))
|
||||
} else if (!string || ast_strlen_zero(string)) {
|
||||
ret = -1;
|
||||
else if (!strcasecmp(string, "off") || ast_false(string))
|
||||
} else if (ast_false(string)) {
|
||||
ret = 0;
|
||||
else if (!strcasecmp(string, "on") || ast_true(string))
|
||||
ret = 1;
|
||||
else {
|
||||
} else if (ast_true(string)) {
|
||||
ret = 0;
|
||||
for (x=0; x<sizeof(perms) / sizeof(perms[0]); x++)
|
||||
ret |= perms[x].num;
|
||||
} else {
|
||||
ret = 0;
|
||||
for (x=0; x<sizeof(perms) / sizeof(perms[0]); x++) {
|
||||
if (ast_instring(string, perms[x].label, ','))
|
||||
|
|
Loading…
Reference in New Issue