kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore initialization of security topics

Browse Source 
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
This commit is contained in:
Matthew Jordan
2013-05-25 17:41:25 +00:00
parent 861633013d
commit 97c6062dfc
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/asterisk.c
View File

@@ -243,6 +243,7 @@ int daemon(int, int); /* defined in libresolv of all places */
#include "asterisk/stasis.h" #include "asterisk/stasis.h"
#include "asterisk/json.h" #include "asterisk/json.h"
#include "asterisk/stasis_endpoints.h" #include "asterisk/stasis_endpoints.h"
#include "asterisk/security_events.h"
#include "../defaults.h" #include "../defaults.h"
@@ -4322,6 +4323,12 @@ int main(int argc, char *argv[])
exit(1); 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 */ if (ast_named_acl_init()) { /* Initialize the Named ACL system */
printf("%s", term_quit()); printf("%s", term_quit());
exit(1); exit(1);
@@ -4382,6 +4389,11 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
if (ast_local_init()) {
printf("%s", term_quit());
exit(1);
}
if (init_manager()) { if (init_manager()) {
printf("%s", term_quit()); printf("%s", term_quit());
exit(1); exit(1);
@@ -4397,11 +4409,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
if (ast_local_init()) {
printf("%s", term_quit());
exit(1);
}
if ((moduleresult = load_modules(0))) { /* Load modules */ if ((moduleresult = load_modules(0))) { /* Load modules */
printf("%s", term_quit()); printf("%s", term_quit());
exit(moduleresult == -2 ? 2 : 1); exit(moduleresult == -2 ? 2 : 1);