diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-09 01:08:04 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-09 01:08:04 +0000 |
| commit | 31e93b286514c6ba23089e22afbb10389713df07 (patch) | |
| tree | fed270ba8aab96b53ba342576d393521d8c0bf13 /main | |
| parent | cde1057ec3dbecf97f6b7de2f2ea03b33d5175ee (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@238916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -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 998942605..e7cf931e1 100644 --- a/main/manager.c +++ b/main/manager.c @@ -980,7 +980,7 @@ static const struct permalias { { EVENT_FLAG_DIALPLAN, "dialplan" }, { EVENT_FLAG_ORIGINATE, "originate" }, { EVENT_FLAG_AGI, "agi" }, - { -1, "all" }, + { INT_MAX, "all" }, { 0, "none" }, }; @@ -1062,7 +1062,7 @@ static int strings_to_mask(const char *string) break; } } - if (!p) { /* all digits */ + if (!*p) { /* all digits */ return atoi(string); } if (ast_false(string)) { |