diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-09 01:27:35 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-09 01:27:35 +0000 |
| commit | 226c9246b2f7bd8b2669d45195ce5c1ce10be1c6 (patch) | |
| tree | 9f9e274794cc91e9641ed413e33cc6a4f31a4db5 /main | |
| parent | a6d2f0e5cfa8372452e25b83f44dc857cbcf69cf (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.0@238968 f38db490-d61c-443f-a65b-d21fe96a405b
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 7cbfcbc52..dfd8b7b4e 100644 --- a/main/manager.c +++ b/main/manager.c @@ -373,7 +373,7 @@ static struct permalias { { EVENT_FLAG_CDR, "cdr" }, { EVENT_FLAG_DIALPLAN, "dialplan" }, { EVENT_FLAG_ORIGINATE, "originate" }, - { -1, "all" }, + { INT_MAX, "all" }, { 0, "none" }, }; @@ -448,7 +448,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; |