diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-09 01:30:52 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-09 01:30:52 +0000 |
| commit | c4d2a11739ff8071ea17cc89dd1a14c5ca716972 (patch) | |
| tree | e562d237909da898afb703e11bd478bda798065c /main/manager.c | |
| parent | c50e575f44d6666a5693d0b9a5fa63869c4ec2bc (diff) | |
Merged revisions 238916 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines
Merged revisions 238915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines
-1 is interpreted as an error, intead of the maximum mask.
(closes issue #16241)
Reported by: vnovy
Patches:
manager.c.patch uploaded by vnovy (license 922)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238985 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 11f557fb4..0e8ef0012 100644 --- a/main/manager.c +++ b/main/manager.c @@ -381,7 +381,7 @@ static struct permalias { { EVENT_FLAG_DIALPLAN, "dialplan" }, { EVENT_FLAG_ORIGINATE, "originate" }, { EVENT_FLAG_AGI, "agi" }, - { -1, "all" }, + { INT_MAX, "all" }, { 0, "none" }, }; @@ -456,7 +456,7 @@ static int strings_to_mask(const char *string) for (p = string; *p; p++) if (*p < '0' || *p > '9') break; - if (!p) /* all digits */ + if (!*p) /* all digits */ return atoi(string); if (ast_false(string)) return 0; |