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
This commit is contained in:
Tilghman Lesher
2010-01-09 01:08:04 +00:00
parent cde1057ec3
commit 31e93b2865

View File

@@ -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)) {