Merged revisions 316206 via svnmerge from
authorSean Bright <sean@malleable.com>
Tue, 3 May 2011 18:23:03 +0000 (18:23 +0000)
committerSean Bright <sean@malleable.com>
Tue, 3 May 2011 18:23:03 +0000 (18:23 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316206 | seanbright | 2011-05-03 14:17:36 -0400 (Tue, 03 May 2011) | 8 lines

  If we aren't interested in events, don't generate the FullyBooted event on AMI login.

  (closes issue #19089)
  Reported by: bklang
  Patches:
        issue19089-1.8-r316204.patch uploaded by seanbright (license 71)
  Tested by: seanbright
........

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

main/manager.c

index 784b379..0c6a650 100644 (file)
@@ -2938,7 +2938,8 @@ static int action_login(struct mansession *s, const struct message *m)
                ast_verb(2, "%sManager '%s' logged on from %s\n", (s->session->managerid ? "HTTP " : ""), s->session->username, ast_inet_ntoa(s->session->sin.sin_addr));
        }
        astman_send_ack(s, m, "Authentication accepted");
-       if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
+       if ((s->session->send_events & 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);
                astman_append(s, "Event: FullyBooted\r\n"