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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@238968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Tilghman Lesher 16 years ago
parent 6714f4a450
commit ca1aafee27

@ -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;

Loading…
Cancel
Save