diff options
author | Matthew Jordan <mjordan@digium.com> | 2013-05-25 17:41:25 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2013-05-25 17:41:25 +0000 |
commit | 97c6062dfc528d60c7115cca1a4a4e7c44c882f6 (patch) | |
tree | 793fb64f5f0a39eb432adf787f9362d17a4417f6 | |
parent | 861633013dc816d237c2b8d17ff6fc722e8b9f63 (diff) |
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
-rw-r--r-- | main/asterisk.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 9407338ed..73d390fad 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); } |