From: Matthew Jordan <mjordan@digium.com>
Date: Sat, 25 May 2013 17:41:25 +0000 (+0000)
Subject: Restore initialization of security topics
X-Git-Tag: 13.0.0-beta1~1761
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97c6062dfc528d60c7115cca1a4a4e7c44c882f6;p=thirdparty%2Fasterisk.git

Restore initialization of security topics

During a merge the security topic initialization got blown away.
This patch restores it.

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

diff --git a/main/asterisk.c b/main/asterisk.c
index 9407338ed5..73d390fad2 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -243,6 +243,7 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #include "asterisk/stasis.h"
 #include "asterisk/json.h"
 #include "asterisk/stasis_endpoints.h"
+#include "asterisk/security_events.h"
 
 #include "../defaults.h"
 
@@ -4322,6 +4323,12 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
+	if (ast_security_stasis_init()) {		/* Initialize Security Stasis Topic and Events */
+		ast_security_stasis_cleanup();
+		printf("%s", term_quit());
+		exit(1);
+	}
+
 	if (ast_named_acl_init()) { /* Initialize the Named ACL system */
 		printf("%s", term_quit());
 		exit(1);
@@ -4382,22 +4389,22 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (init_manager()) {
+	if (ast_local_init()) {
 		printf("%s", term_quit());
 		exit(1);
 	}
 
-	if (ast_enum_init()) {
+	if (init_manager()) {
 		printf("%s", term_quit());
 		exit(1);
 	}
 
-	if (ast_cc_init()) {
+	if (ast_enum_init()) {
 		printf("%s", term_quit());
 		exit(1);
 	}
 
-	if (ast_local_init()) {
+	if (ast_cc_init()) {
 		printf("%s", term_quit());
 		exit(1);
 	}