[asterisk-commits] mjordan: trunk r389770 - /trunk/main/asterisk.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat May 25 12:41:25 2013
New Revision: 389770

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389770
Log:
Restore initialization of security topics

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

Modified:
    trunk/main/asterisk.c

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=389770&r1=389769&r2=389770
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Sat May 25 12:41:25 2013
@@ -243,6 +243,7 @@
 #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 @@
 		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,6 +4389,11 @@
 		exit(1);
 	}
 
+	if (ast_local_init()) {
+		printf("%s", term_quit());
+		exit(1);
+	}
+
 	if (init_manager()) {
 		printf("%s", term_quit());
 		exit(1);
@@ -4393,11 +4405,6 @@
 	}
 
 	if (ast_cc_init()) {
-		printf("%s", term_quit());
-		exit(1);
-	}
-
-	if (ast_local_init()) {
 		printf("%s", term_quit());
 		exit(1);
 	}