From: Terry Wilson <twilson@digium.com>
Date: Thu, 24 Feb 2011 17:57:18 +0000 (+0000)
Subject: Merged revisions 308814 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=463a39b5d1bdd37720dc219a2c48d990db0fb41b;p=thirdparty%2Fasterisk.git

Merged revisions 308814 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r308814 | twilson | 2011-02-24 11:54:49 -0600 (Thu, 24 Feb 2011) | 19 lines

  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.8@308815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index 0a91c34bab..5c305f5445 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2933,7 +2933,11 @@ static int action_login(struct mansession *s, const struct message *m)
 	}
 	astman_send_ack(s, m, "Authentication accepted");
 	if (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;
 }