]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Manager: Require read permission for SYSTEM in order to send FullyBooted
authorJonathan Rose <jrose@digium.com>
Thu, 4 Sep 2014 20:46:46 +0000 (20:46 +0000)
committerJonathan Rose <jrose@digium.com>
Thu, 4 Sep 2014 20:46:46 +0000 (20:46 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@422626 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index 0475729419c136ddd8ec10f32a21140a359e32cf..e598cc7b6451e64430a3bb2af349bfc4a3127bd9 100644 (file)
@@ -3615,6 +3615,7 @@ static int action_login(struct mansession *s, const struct message *m)
        }
        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);