diff options
| author | Sean Bright <sean@malleable.com> | 2011-05-03 18:23:03 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2011-05-03 18:23:03 +0000 |
| commit | a52395aaeeb6350ec4b54632833f88ef27ba7ec8 (patch) | |
| tree | fac0959fdb61ed7af17ea8371c8777b78d6590b1 | |
| parent | 1fca95b1d45f01ad13edef77cd0b04db546c8a89 (diff) | |
Merged revisions 316206 via svnmerge from
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
| -rw-r--r-- | main/manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 784b3799c..0c6a650c1 100644 --- a/main/manager.c +++ b/main/manager.c @@ -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" |