[asterisk-commits] jrose: branch 13 r422631 - in /branches/13: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Sep  4 16:23:22 2014
New Revision: 422631

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422631
Log:
Manager: Require read permission for SYSTEM in order to send FullyBooted

Review: https://reviewboard.asterisk.org/r/3969/
........

Merged revisions 422584 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 422625 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 422626 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    branches/13/   (props changed)
    branches/13/main/manager.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/main/manager.c?view=diff&rev=422631&r1=422630&r2=422631
==============================================================================
--- branches/13/main/manager.c (original)
+++ branches/13/main/manager.c Thu Sep  4 16:23:22 2014
@@ -3697,6 +3697,7 @@
 	}
 	astman_send_ack(s, m, "Authentication accepted");
 	if ((s->session->send_events & EVENT_FLAG_SYSTEM)
+		&& (s->session->readperm & EVENT_FLAG_SYSTEM)
 		&& ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
 		struct ast_str *auth = ast_str_alloca(80);
 		const char *cat_str = authority_to_str(EVENT_FLAG_SYSTEM, &auth);