summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-02-24 17:59:32 +0000
committerTerry Wilson <twilson@digium.com>2011-02-24 17:59:32 +0000
commitf88ef55d748a995a7d7aba10d3a84252c1d6dafe (patch)
tree4581b6d1cfa4746bde80fce087f2bd0b55d4e9e9
parent0658c5ec2e12dbc8a8735886427b86326b11233f (diff)
Merged revisions 308815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r308815 | twilson | 2011-02-24 11:57:18 -0600 (Thu, 24 Feb 2011) | 26 lines 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/trunk@308816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/manager.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c
index 599dbca6d..1b0ce8897 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2927,7 +2927,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;
}