kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 238916 via svnmerge from

Browse Source 
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.1@238983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-01-09 01:30:38 +00:00
parent 5dcfc56b56
commit b5dada66bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/manager.c
View File

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