[asterisk-commits] seanbright: branch 1.8 r316206 - /branches/1.8/main/manager.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue May  3 13:17:36 2011
New Revision: 316206

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316206
Log:
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

Modified:
    branches/1.8/main/manager.c

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=316206&r1=316205&r2=316206
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Tue May  3 13:17:36 2011
@@ -2946,7 +2946,8 @@
 		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"