From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 9 Jan 2010 01:30:38 +0000 (+0000)
Subject: Merged revisions 238916 via svnmerge from
X-Git-Tag: 1.6.1.15-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5dada66bfd0f1bd2b707826e4eda494a8a7be85;p=thirdparty%2Fasterisk.git

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.1@238983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index cc131b63a3..0263c4ad4b 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -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;