Merged revisions 308813 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r308813 | twilson | 2011-02-24 11:42:16 -0600 (Thu, 24 Feb 2011) | 12 lines

  Don't broadcast FullyBooted to every AMI connection

  The FullyBooted event should not be sent to every AMI connection every
  time someone connects via AMI. It should only be sent to the user who
  just connected.

  (closes issue #18168)
  Reported by: FeyFre
  Patches:
        bug0018168.patch uploaded by FeyFre (license 1142)
  Tested by: FeyFre, twilson
........

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

diff --git a/main/manager.c b/main/manager.c
index 560ebbdb58846f1400f21d4d02fc68bff59d7dd3..eac123c143c37a0a0d887c382dad8caca980e469 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -1792,7 +1792,11 @@ static int action_login(struct mansession *s, const struct message *m)
        ast_log(LOG_EVENT, "%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_opt_send_fullybooted && ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
-               manager_event(EVENT_FLAG_SYSTEM, "FullyBooted", "Status: Fully Booted\r\n");
+               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"
+                       "Privilege: %s\r\n"
+                       "Status: Fully Booted\r\n\r\n", cat_str);
        }
        return 0;
 }