[asterisk-commits] lmadsen: branch 1.8 r318485 - /branches/1.8/main/manager.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue May 10 13:46:25 2011
New Revision: 318485

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318485
Log:
Filter out blacklisted manager events when using eventfilter.

Merging change from trunk in revision 306432.

(closes issue #19260)
Reported by: dhubbard
Tested by: dhubbard

Modified:
    branches/1.8/main/manager.c

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=318485&r1=318484&r2=318485
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Tue May 10 13:46:25 2011
@@ -4087,11 +4087,12 @@
 	const char *eventdata = arg;
 	int *result = data;
 
-	if (regexec(regex_filter, eventdata, 0, NULL, 0)) {
-		*result = 1;
+	if (!regexec(regex_filter, eventdata, 0, NULL, 0)) {
+		*result = 0;
 		return (CMP_MATCH | CMP_STOP);
 	}
 
+	*result = 1;
 	return 0;
 }