From 97c6062dfc528d60c7115cca1a4a4e7c44c882f6 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Sat, 25 May 2013 17:41:25 +0000 Subject: [PATCH] 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 --- main/asterisk.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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,6 +4389,11 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_local_init()) { + printf("%s", term_quit()); + exit(1); + } + if (init_manager()) { printf("%s", term_quit()); exit(1); @@ -4397,11 +4409,6 @@ int main(int argc, char *argv[]) exit(1); } - if (ast_local_init()) { - printf("%s", term_quit()); - exit(1); - } - if ((moduleresult = load_modules(0))) { /* Load modules */ printf("%s", term_quit()); exit(moduleresult == -2 ? 2 : 1);